merge from eclair
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:44 +0000 (12:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:44 +0000 (12:06 -0800)
commitc4ba8f5766658fedec1e3a9efd6df856389f70aa
tree88f7337103dd0bf648d98315961ddcfbdc791a35
parentd95e0aa4e24d106eb383998b95a0c5f688a746d6
parent87c647bedba52cac7a70b82bedece8d8d532b5c8
merge from eclair