Merge branch 'guestfish'
authorMartin Schwenke <martin@meltin.net>
Tue, 15 Feb 2011 04:15:29 +0000 (15:15 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 15 Feb 2011 04:15:29 +0000 (15:15 +1100)
1  2 
autocluster

diff --cc autocluster
Simple merge