[MERGE] Merge up with bzr.dev.

[Robert Collins]

Updated for bzr 1.3:

I took the plunge and added alias support for BzrDirFormatRegistry, so 
that we can have the UI tests not get confused by the presence of
aliases.

This makes test pass now, so I can merge the new development format
changes, which got approved, but the alias support needs a review.

Thats basically the test_bzrdir.py, bzr_dir.py and tests.test_info
changes.
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-kVPKwu.patch
Type: text/x-patch
Size: 43212 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080214/11c8cad9/attachment-0001.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/20080214/11c8cad9/attachment-0001.pgp