Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 13:12:01 +0000 (15:12 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 13:12:01 +0000 (15:12 +0200)

Trivial merge