Merge commit 'origin/v3-2-test' into v3-2-stable
commita390bcf9403df4cf4d5eef42b35ebccbe253882e
authorKarolin Seeger <kseeger@samba.org>
Fri, 29 Feb 2008 09:44:38 +0000 (29 10:44 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 29 Feb 2008 09:44:38 +0000 (29 10:44 +0100)
tree4d2e09ac4fddef7c88e44a01dd9b825c1a3ffbd5
parent6993b6139419761c649f3ad54467a2c34f29382d
parent364d87a5e41045808ebd28f46c5c0c93bd13a7da
Merge commit 'origin/v3-2-test' into v3-2-stable

Conflicts:

WHATSNEW.txt
WHATSNEW.txt