Commit 2aed42f2d3a4aeb938408ffc64859def583b25d5

Stefano Lattarini 2011-04-19T22:47:48

Merge branch 'me-override-fix'