Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 12 Jan 2011 22:44:40 +0000 (23:44 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 12 Jan 2011 22:44:40 +0000 (23:44 +0100)

Trivial merge