Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 13:56:11 +0000 (15:56 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 13:56:11 +0000 (15:56 +0200)

Trivial merge