Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Nov 2011 14:26:32 +0000 (15:26 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Nov 2011 14:26:32 +0000 (15:26 +0100)

Trivial merge