Comment 18 for bug 528041

SRU ack for http://bazaar.launchpad.net/~lifeless/ubuntu/lucid/bzr/2.1.2-sru/revision/15. It's a bit unfortunate that the diff is so large, but most is just changed source line comments in the pyx stuff. The other changes seem to be testcase'd nicely. Please upload.