Apply patch by Ian Campbell

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699093 for details
Merge branch 'debbug-699093'
Release 1.1