Merge fix for 140001.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 30 Oct 2007 22:10:40 +0000 (23:10 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 30 Oct 2007 22:10:40 +0000 (23:10 +0100)

Trivial merge