Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Thu, 31 Jul 2008 16:16:33 +0000 (18:16 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 31 Jul 2008 16:16:33 +0000 (18:16 +0200)
commite58c68bd3f1eb921f2978e51c1427590e11d6089
treed77db9e6ea7a7e8f4515099e232688adcfddedf3
parent092928d8c3c49cb366652eb2ac91371ae5424362
parentda771f13af99388005df60e2bec5c5ee5a2f5d95
Merge commit 'origin/v3-2-stable' into v3-2-ctdb