Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 16:24:54 +0000 (18:24 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 16:24:54 +0000 (18:24 +0200)

Trivial merge