Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 13 Sep 2007 21:56:50 +0000 (23:56 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 13 Sep 2007 21:56:50 +0000 (23:56 +0200)

Trivial merge