[MERGE] Various test fixes and tweaks for packs.

[Robert Collins]

As the topic says, this is just a bunch of test tweaks I did in the
packs branch.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-Qabmk0.patch
Type: text/x-patch
Size: 15281 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070914/13afda1a/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070914/13afda1a/attachment.pgp