Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
authorJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:28:18 +0000 (15:28 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:28:18 +0000 (15:28 +0100)
commit30a3dec549dc408940710409c80276077b4d9701
treeb0c0106ccbb9874875100ae5e18ec301e5c9f777
parentc42fc5e103d9d210c2f370e237a952e6df361792
parent853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
source3/Makefile.in