Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Sep 2013 14:51:16 +0000 (16:51 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Sep 2013 14:51:16 +0000 (16:51 +0200)

Trivial merge