Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:04:47 +0000 (29 11:04 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:04:47 +0000 (29 11:04 +0100)

Trivial merge