OSDN Git Service

merge from eclair
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:05:38 +0000 (12:05 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:05:39 +0000 (12:05 -0800)
commitbf09a515ae42fcd3a55652891245d5d4d6d02215
tree582b0c0f2a7af6db8cdb4d6c37131a78b9741a2a
parent0574b7fecb98e8a12c4b8fed8b33bf552ac21373
parentf600a6395d24f214ccb9022d807360348947e295
merge from eclair