merge from tridge

diff --cc common/ctdb_message.c
index 95df3c2c8de7ade9ae8ae8bd7f2117f32e289cd0,95df3c2c8de7ade9ae8ae8bd7f2117f32e289cd0..cb85d21a6052f4979df1a7dff2909cf9b6b4038e
--- 1/common/ctdb_message.c
--- 2/common/ctdb_message.c
+++ b/common/ctdb_message.c
@@@ -36,8 -36,8 +36,6 @@@ static int ctdb_dispatch_message(struc
  {
        struct ctdb_message_list *ml;
  
--      /* XXX we need a must faster way of finding the matching srvid
--         - maybe a tree? */
        for (ml=ctdb->message_list;ml;ml=ml->next) {
                if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) {
                        ml->message_handler(ctdb, srvid, data, ml->message_private);