resolved conflicts for merge of fd860fde to master
Jason Chen [Thu, 4 Nov 2010 02:58:45 +0000 (19:58 -0700)]
Change-Id: Ib2d933ce3edfa1b5e6cd57c1c1ea244eedb6e572


Trivial merge