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 this patch *should* be the equivalent of then doing a pull of http://norman.rasmussen.co.za/darcs/psi-muc-bundle/ followed by http://matt.wronka.org/stuff/projects/icpp/psi/psi-jingle/psi-jingle+pulled-muc-20050817.diff This has everything in the psi-muc-bundle except some Growl patch labelled BROKEN anyway.