Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Sun, 8 Feb 2009 23:53:47 +0000 (10:53 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sun, 8 Feb 2009 23:53:47 +0000 (10:53 +1100)
(This used to be ctdb commit 1a110993af1706e0c5df500fa7d14e16c0668372)

1  2 
ctdb/Makefile.in

Simple merge