resolved conflicts for merge of bf1439c5 to stage-korg-master

Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
This commit is contained in:
Jean-Baptiste Queru 2010-12-02 15:16:53 -08:00
commit a4130babac

Diff Content Not Available