A bogus logic error snuck in the previous commit that doesn't work.
Do-Not-Merge: in version I'm testing in ix repo.
Authored by: yaberauneya 2011-12-18
Parent: [r9194]
Child: [r9196]
