Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 21 Jun 2008 16:29:14 +0000 (18:29 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 21 Jun 2008 16:29:14 +0000 (18:29 +0200)

Trivial merge