Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 3 Apr 2008 15:58:37 +0000 (17:58 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 3 Apr 2008 15:58:37 +0000 (17:58 +0200)

Trivial merge