Comment 3 for bug 518170

Thanks for your patch, Alex. Although there is extra stuff in it from previous patches you posted, I am able to apply the changes for this bug only. I've committed it to the Lucid dev branch, rev 447.

In the future, please make sure you revert other changes not applicable to the bug you're working on, and make sure your local copy of the bzr branch is up to date. Cheers.