OSDN Git Service

resolved conflicts for merge of 3d2560ad to master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 10 Dec 2009 21:29:05 +0000 (13:29 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 10 Dec 2009 21:29:19 +0000 (13:29 -0800)
commitd9f2d9f22ec8ff17e59e7f90a5b261f5d50629d0
tree59127c6f7651d3606cd995d0bc9476e8e5a0526d
parentaaeef5cc64e3ad96f0d92bf7dd2f39879e9b76a6
parent3d2560ad9281b03ce737f7e85752e92c457f87c2
resolved conflicts for merge of 3d2560ad to master