merge john.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 30 Dec 2008 00:26:00 +0000 (00:26 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 30 Dec 2008 00:26:00 +0000 (00:26 +0000)

Trivial merge