Merge cleanups from Dave.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 30 Apr 2010 21:18:34 +0000 (23:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 30 Apr 2010 21:18:34 +0000 (23:18 +0200)

Trivial merge