Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorVolker Lendecke <vl@samba.org>
Fri, 13 Jun 2008 10:04:48 +0000 (12:04 +0200)
committerVolker Lendecke <vl@samba.org>
Fri, 13 Jun 2008 10:04:48 +0000 (12:04 +0200)

Trivial merge