Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (19:32 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (19:32 +0200)
commit68a2c547d00d7a8d0c15744172489d9d010c31a3
tree54313b0dc50014015d680121fa750a5d4777c7a4
parent2cdfaedee203a726bddfb46fb10d9604de32a05f
parent4f51b0246db3242ee02ee16905cba13a5dc5633a
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 0f0c8519b87481e3473a469cefd51c76b4a7632e)