Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 00:55:53 +0000 (10:55 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 00:55:53 +0000 (10:55 +1000)
commit41e4f12c482082d6e622d1fdc830e38853cdbd8b
tree754245cda53332b540b7a85a0d5d0f2674edd92c
parent82ad66e9dfd30f7ffe912f6c9198908c40802ac4
parentfc056e561b95fb7869053bdec810e8c47e6c6dc2
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel