Merge commit '5e95c548864bc8b075b8343e69a69e1a22c92456' into 3.2-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 13 Oct 2007 22:56:27 +0000 (00:56 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 13 Oct 2007 22:56:27 +0000 (00:56 +0200)

Trivial merge