merge from eclair master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:38 +0000 (12:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:38 +0000 (12:06 -0800)
commitcda218e88757f1341d4707545a29cdc7b052e10f
tree951177043ca68a25c127d120745e54d1803669c0
parent012c15220108e49446d20449fd0986ecec920882
parent8063d28ae09a565b2e6fba5a9a8fcb7050f76041
merge from eclair