Comment 11 for bug 981269

Yaguang/Chris

I took a look at the proposed patch; currently its a partial backport of the fix applied to folsom; would it be possible to make it a more complete cherry pick including unit tests?

This will make things easier in the long run.

Thanks