Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 11 Nov 2009 01:16:30 +0000 (12:16 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 11 Nov 2009 01:16:30 +0000 (12:16 +1100)
commit9dabb86f3f5270a17882fa72be7d79cd23032d5e
tree8ed033041dbfbdd20c975d28a18f41a3793ea52a
parent8767c894a0388f576a6bdd625d2917628f49150d
parent14a6592511eb8dc9930f6722856c91d7b5f97889
Merge commit 'origin/master'

(This used to be ctdb commit ffb911896704ddf6bd5a66e43ba2ae8c382e68de)