Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
authorJelmer Vernooij <jelmer@samba.org>
Wed, 25 Mar 2009 19:51:29 +0000 (20:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 25 Mar 2009 19:51:29 +0000 (20:51 +0100)

Trivial merge