Merge in 'guymager'.

This package gets a binary package from Debian. We should build it from
source.