*sigh*

These patches should apply to current master but I somehow messed up
 my development tree. Two separate commits where squashed to 2/7 --
 will post a follow up this afternoon.

Best,
  -- David
--
OpenPGP... 0x99ADB83B5A4478E6
Jabber.... dmjena@jabber.org
Email..... dmaus@ictsoc.de