Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jul 2008 17:10:58 +0000 (19:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jul 2008 17:10:58 +0000 (19:10 +0200)

Trivial merge