Merge branch 'me-override-fix' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 19 Apr 2011 20:39:14 +0000 (22:39 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 19 Apr 2011 20:39:14 +0000 (22:39 +0200)

Trivial merge