OSDN Git Service

merge from eclair
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:42 +0000 (12:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:42 +0000 (12:06 -0800)
commit4b7ae714e1ef41c3d9bc640fef43fd2b395a7054
tree4194bafcb9956a4838ec6396ca36536b6738e2ad
parentbc45486fa445e6bcd3d79c2b65a2633d7a241a8f
parentafc7480077e2e96815ed06652e7ef7030c306369
merge from eclair