tree 9b3e937be853928a9c99ccfc341b37f5e103c61e
parent 1fe74722b608a66381d186b32b2fb59d254194c7
author Jean-Baptiste Queru <jbq@google.com> 1296145585 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296148918 -0800

re-merge from readonly-korg-master - do not merge

Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2