Apply patch for CAN-2005-0104 which is part of a patch I had to prepare for
Debian woody which still has 1.2.6 :-(. Because I have the patch available
I'll just as well commit this in this ancient branch.