Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Wed, 28 May 2008 08:16:48 +0000 (10:16 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 28 May 2008 08:16:48 +0000 (10:16 +0200)
commit36e6641e753368b3f92c8835ad2806de28290500
treed219cab9b5837f4bf98201e9ee3b791382827550
parent977c4dc645f454c4975c125f58f34fcf57455b51
parentcea629ebaf1ab0079f1aa7a373ff7baf7d60a4a1
Merge commit 'origin/v3-2-stable' into v3-2-ctdb