Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commitb697b2ee86407ece5e9b80b7fb421564d185af98
authorMichael Adam <obnox@samba.org>
Thu, 22 May 2008 21:04:53 +0000 (22 23:04 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 22 May 2008 21:04:53 +0000 (22 23:04 +0200)
treee40659a37efb5664c933b04ff873196a8a29ca1c
parent8e4f23acf95963c302e827452bd20974c7b3c06f
parent227fb2af135ba3a86efc99e8a7dd400c45eb0e78
Merge commit 'origin/v3-2-stable' into v3-2-ctdb