[stacked:MERGE] Let stacked branches pass the test suite

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch enables Robert's stacked branch work to pass the test suite.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFID+zs0F+nu1YWqI0RAiJ5AJ9mtJ9VHttjSmARfNn6qh7aWTqMZACfdm5e
sBq/lj+yvyctfVZKLXymN8k=
=GT9L
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: stacked-fixes-3255.patch
Type: text/x-diff
Size: 97477 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080423/02a4232b/attachment-0002.bin