Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 20 Feb 2012 00:52:17 +0000 (01:52 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 20 Feb 2012 00:52:17 +0000 (01:52 +0100)

Trivial merge