There is a pqm test failure in this that I still need to investigate, so as of now it's not merged into either trunk or 1.7. I'll try to fix it for at least trunk, and will wait for John's ok to merge it to 1.7. I do think we should put it in there though. -- Martin <http://launchpad.net/~mbp/>