attempted merge

[Matthew East]

I've just tried to merge most of the breezy branch back to trunk.

Essentially, I've done an svn rm on everything that I wanted to replace
in trunk. Then I svn cp'ied from the branch to the trunk.

I've done every subfolder in branches/breezy except for kde, which I
know Riddell did already.

It seems to have gone well.

Lemme know if I've buggered this up, and/or missed anything out.

Thanks

-- 
mdke at ubuntu.com
gnupg pub 1024D/0E6B06FF
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20051027/9087549c/attachment.pgp>