Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 08:51:02 +0000 (09:51 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 08:51:02 +0000 (09:51 +0100)

Trivial merge