Marc Herbert - 2011-04-07

Looks very similar to bug 2999830