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)
commit5d1f3f0c14af19df45406386b514008916f7d80b
tree7d8619cec46e69fa88c5271c15ae78357ed0ae96
parent3b64c7d208952e94c4b6a317cf34e5e650e77fe6
parent9b5a8552fec112499a527a8af8577a9b76144435
Merge branch 'me-override-fix' into maint