[MERGE] Copyright cleanup

[John Arbash Meinel]

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

Cheuksan Edward Wang wrote:
> I found a place where John missed. It's probably the most important clean
> up.
> The changeset is attached.
> 

Thanks. I was just checking the comment strings with the test, and
wasn't really looking elsewhere. I don't think we really need a test for
it, since this is the only place where __copyright__ should be defined
other than at the start of the file.

...

> 
> === modified file bzrlib/__init__.py
> --- bzrlib/__init__.py
> +++ bzrlib/__init__.py
> @@ -26,7 +26,7 @@
>  user_encoding = get_user_encoding()
>  
>  
> -__copyright__ = "Copyright 2005, 2006 Canonical Development Ltd."
> +__copyright__ = "Copyright 2005, 2006 Canonical Ltd."
>  
>  # same format as sys.version_info: "A tuple containing the five components of
>  # the version number: major, minor, micro, releaselevel, and serial. All

This should be fine to add for bzr-0.12.

John
=:->

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

iD8DBQFFNcu2JdeBCYSNAAMRAvw9AJ9dDte1BzPesddr2hnZPlefRc+CvgCgwzpH
kjFbh8ICqBEJFi4T+A1xupc=
=bnjv
-----END PGP SIGNATURE-----