Merge from honeycomb
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:34 +0000 (14:32 -0800)]
Change-Id: I2778dfd3a4cf20255e07483dcc3676b2fca022b9


Trivial merge