Merge branch 'maint'
authorYann Dirson <ydirson@free.fr>
Mon, 10 Feb 2014 19:56:58 +0000 (20:56 +0100)
committerYann Dirson <ydirson@free.fr>
Mon, 10 Feb 2014 19:56:58 +0000 (20:56 +0100)

Trivial merge