Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit0f0c8519b87481e3473a469cefd51c76b4a7632e
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (14 19:32 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (14 19:32 +0200)
treefda992869ba9ba1b19df1896ab7e46112b1e732b
parent280339e3d126f5c72dc271051b72839fde0c5c9f
parent957c4d893acf9e6db06a3fc3a4687ab6bb238635
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet