[MERGE] Use locations.conf instead of branches.conf

[Aaron Bentley]

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

Hi all,

This patch changes the default name for branches.conf to locations.conf,
because
1. It is used to configure more things than just branches
2. It is more visually distinct from 'branch.conf' that way.
3. It hints at the fact that the location of the branch controls the
associated info, and that moving the branch may change the associated info.

branches.conf is still supported, but produces a warning.

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

iD8DBQFEktbU0F+nu1YWqI0RAoUVAJwOJs6iR9Uiy9ZakRgDdUjJ9/ZZpQCfV4NY
0iIUfVq/0g4a6R2knSrWMtM=
=WCr+
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: locations.conf
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060616/488c4386/attachment.diff