Merge branch 'master' of ssh://git.samba.org/data/git/samba into tevent-standalone
authorJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 19:33:02 +0000 (20:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 19:33:02 +0000 (20:33 +0100)

Trivial merge