If you start with psi-jingle (http://psi-im.org/wiki/Jingle) and 
http://matt.wronka.org/stuff/projects/icpp/psi/psi-jingle/psi-jingle-20050816.diff
and pull http://norman.rasmussen.co.za/darcs/psi-muc-bundle/
this patch will fix-up the remaining errors.

This has everything in the psi-muc-bundle except some Growl patch 
labelled BROKEN anyway.