Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 1 Oct 2007 23:30:54 +0000 (01:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 1 Oct 2007 23:30:54 +0000 (01:30 +0200)

Trivial merge