I merged this, with the test, for 1.4final. I'll also send that to trunk when pqm completes, and also send just this patch in preparation for 1.3.2, which we can ask to send back into hardy. -- Martin <http://launchpad.net/~mbp/>