Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 31 Oct 2007 13:39:28 +0000 (14:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 31 Oct 2007 13:39:28 +0000 (14:39 +0100)

Trivial merge