* Merge from debian unstable. (closes lp: #192034) - dropped superflous removal of unused dpatch system and e-mailed Debian maintainer to please make the change in Debian. - install groupOfNames template to templates/creation/ instead of templates/additional-templates/ so that users will be able to use it. * Remaining Ubuntu changes: - debian/additional-templates/*: . added groupOfNames.xml (a commonly used object, see lp: #72779) - debian/rules: . added call to dh_install to install debian/additional-templates/* - debian/control: Maintainer fields updated.