Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 13:08:44 +0000 (22 14:08 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 13:08:44 +0000 (22 14:08 +0100)

Trivial merge