Merge clientstate branch.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 13 Nov 2007 14:47:12 +0000 (15:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 13 Nov 2007 14:47:12 +0000 (15:47 +0100)

Trivial merge