Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)
commit486891bb5167034e54b7477ba09e8f5f914b93e4
tree18afb65d148057018a6fddbf4517360b98c8f2db
parent31a303c099e26423160010c48b305434d4cbea25
parent88970c4d4192635544cf63e79e929e9bb05ecb5f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet