Comment 4 for bug 1482806

@Alvin - thanks a lot: patch tested successfully with r14293 on OS X 10.7.5 with the test cases described here as well as the one attached in bug #1484009 (didn't take the time to look out for any unexpected side-effects or regressions though).