Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
authorJelmer Vernooij <jelmer@samba.org>
Fri, 20 Mar 2009 15:40:09 +0000 (16:40 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 20 Mar 2009 15:40:09 +0000 (16:40 +0100)

Trivial merge