Imported Debian patch 0.3+svn20091101-1