Squashed commit of the following:
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:43:05 +0000 (09:43 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:43:05 +0000 (09:43 -0400)
commit78a8eb5b6ebac0afe3e899990860c6f18c013f52
treed387d254c77bacdda03a5abb3e541b657017ec9e
parentdad72cce28866d7a95926d97378c20aa3eff9150
Squashed commit of the following:

commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
plugins/Xmpp/XmppPlugin.php
scripts/stopdaemons.sh