Merged r6224:6268 from features/deb into trunk. Implements most of a Debian package...