Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (22:11 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (22:11 -0700)
commit8e96f2edb003d997e71e9e237463882696279d0f
tree2cbb96685d7db4c49e9775bdad9d9a6e1b9f760f
parent8e919dcb0826a5b25d037ee6144af5f7cb21f3ae
parentdcdfee611ccc0ae798e3eea2cfdf3c7642dc5677
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test