Merge commit 'origin/v3-2-test' into v3-2-obnox
authorMichael Adam <obnox@samba.org>
Wed, 24 Oct 2007 21:25:52 +0000 (23:25 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 24 Oct 2007 21:25:52 +0000 (23:25 +0200)
commit6555fd766ff93d6ae3569324505c2eb1a0368a3a
tree83f951e5c632a4485dff0394d2f083a411a06301
parentf0aa637a0481e0a44f86318adbf48957be554eab
parent98e154c3125d5732c37a72d74b0eb5cd7b6155fd
Merge commit 'origin/v3-2-test' into v3-2-obnox