tree 3a8d2dafed8d089a524aae2dc242204f1fcad0ee
parent 8df3a4a554184afba71887995c5f0983ce81196f
parent bb130ba7998e82e79cd94cddee2b97b1ed977f21
author Jean-Baptiste Queru <jbq@google.com> 1284140522 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1284140616 -0700

manual merge from readonly-korg-master

Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548