Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:08:01 +0000 (17:08 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:08:01 +0000 (17:08 +0200)

Trivial merge