OSDN Git Service

resolved conflicts for merge of 081a136d to eclair
authorJean-Baptiste Queru <jbq@google.com>
Fri, 21 Aug 2009 19:59:04 +0000 (12:59 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 21 Aug 2009 19:59:04 +0000 (12:59 -0700)
commite0037413f2d16e1b8d1032e1791fd37621719e36
treed8914aa0428927c02fd58c58ddece1341d907846
parentdcab2ad3b639bdad89c16210db985e9a049e263d
parenta9a5a90d030867dd2c9c1242e3846318d003db16
resolved conflicts for merge of 081a136d to eclair