[merge] Adeodato Simó's message updates, plus tests

[John Arbash Meinel]

I merged Adeodato Simó's changes to make a couple user messages nicer,
and I added a couple of tests to them.

I think they are ready to be merged. I only really added tests to
Adeodato's work, so I'll merge it tomorrow unless someone is unhappy.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: update_and_commit_updates.diff
Type: text/x-patch
Size: 6944 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060731/6de49285/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060731/6de49285/attachment.pgp