OSDN Git Service

resolved conflicts for merge of 59a3008a to master
authorJack Palevich <jackpal@google.com>
Thu, 10 Dec 2009 02:12:42 +0000 (10:12 +0800)
committerJack Palevich <jackpal@google.com>
Thu, 10 Dec 2009 02:12:42 +0000 (10:12 +0800)

Trivial merge