Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 08:47:30 +0000 (10:47 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 08:47:30 +0000 (10:47 +0200)

Trivial merge