Merge cleanups and use of proper per-service capabilities from Augie.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 5 May 2010 10:40:01 +0000 (12:40 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 5 May 2010 10:40:01 +0000 (12:40 +0200)

Trivial merge