Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 16 Oct 2008 01:58:25 +0000 (12:58 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 16 Oct 2008 01:58:25 +0000 (12:58 +1100)
1  2 
tools/ctdb_diagnostics

Simple merge