I cleaned up the original carnage so that 7c2105fbe9658d6cee18751568e29579bb58bfec was a clean cherry-pick. I had to do something similar for the unstable branch as well. rtg -- Tim Gardner tim.gardner at canonical.com