merge from ronnie

(This used to be ctdb commit 361f203c3c2a41eb974aba09b66eea0731387c3d)

diff --cc ctdb/Makefile.in
index 30ded638db5a05409eea1443b902525280ab52e2,9ffe4816511be0de6dfa155de510c437f81eb23e..e817493bdc2248ae702addf7a03ac10d068d7f17
--- 1/ctdb/Makefile.in
--- 2/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@@ -133,6 -139,8 +139,7 @@@ install: al
        ${INSTALLCMD} -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
        if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
        if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
 -      if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
+       if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
        cd $(DESTDIR)$(bindir) && ln -sf onnode.ssh onnode
  
  test: all