Null merge
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 22 Feb 2012 18:23:13 +0000 (19:23 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 22 Feb 2012 18:23:13 +0000 (19:23 +0100)

Trivial merge