forgoten branch now closed
cherry-pick
2009-08-12, beremiz