[MERGE] Merge in and clean up the test for bug #83039.

[John Arbash Meinel]

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

This just cleans up the test case to conform to our standard conventions, and
merges it in. We fixed partial commit with renames a while ago (though there are
other bugs still open.)

I figured another explicit test of this code is ok.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgI5TcACgkQJdeBCYSNAAMcUwCeJAdwd7ofvb0FM6X3MUNeDbtj
Tu0An0AubouGqc77uzQtOYrIxV71NUIr
=Fbgm
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: test_83039-3374.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080418/ec92a823/attachment-0001.diff