OSDN Git Service

Merge from eclair
authorJean-Baptiste Queru <jbq@google.com>
Fri, 5 Mar 2010 15:23:14 +0000 (07:23 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 5 Mar 2010 15:23:14 +0000 (07:23 -0800)
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29


Trivial merge