375d90c81b2a9ad1be5bc370fcb963e241a0ea2d Merge branch '2011.03-maintenance' into overo-2011.03