OSDN Git Service

resolved conflicts for merge of 2576abf0 to master
authorDavid 'Digit' Turner <digit@google.com>
Fri, 2 Jul 2010 22:22:19 +0000 (15:22 -0700)
committerDavid 'Digit' Turner <digit@google.com>
Fri, 2 Jul 2010 22:22:19 +0000 (15:22 -0700)
Change-Id: Ibd3ed11f3cc27ff12c0464b0f56d7057be6a7b85


Trivial merge