merge from kraken

Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
This commit is contained in:
Jean-Baptiste Queru 2010-04-06 16:36:09 -07:00
commit 2f958d65a7

Diff Content Not Available