* Merge with Debian testing, remaining Ubuntu changes:
  - debian/control:
    + update Vcs-* fields for lucid
    + recommend xfce4-volumed instead of aumix. lp: #386589
* debian/control: fix typo in Vcs-* fields.
* New upstream release.
* debian/patches:
  - 01_xi2-support dropped, included upstream.
* debian/control:
  - dump quilt build-dep.
* debian/rules:
  - dump quilt addon.