Null merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 19:39:02 +0000 (20:39 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 19:39:02 +0000 (20:39 +0100)

Trivial merge