merges galore

[Stefan Potyra]

Hi,

after seeing a number of changes for jaunty already (woohoo!), a few hints:
* please build your changes files with the -v option, so that changes done in 
Debian, but not in Ubuntu will be part of the changes file
* please check if each bit of the delta is still necessary, and drop it if not
* if a specific delta applies to both Ubuntu and Debian, please forward the 
changes and mention the bug number in the changelog
* if a specific delta applies only to Ubuntu, please also mention this in the 
changelog

Cheers,
    Stefan.
-------------- 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/ubuntu-devel/attachments/20081105/33739741/attachment.pgp