* Merge with Debian. Remaining changes: * debian/control.in: - Drop the scrollkeeper build-depends - Use the ubuntu epoch number for the nautilus depends - Depend on zip and unzip instead of p7zip which is in universe - Depend on genisoimage - Recommend sessioninstaller