Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 17 Oct 2008 04:57:07 +0000 (15:57 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 17 Oct 2008 04:57:07 +0000 (15:57 +1100)
commitc35b0d9ab5d01e37cb06d02083a329e18ae59566
tree20dd5885cf3da8d030ef69ab0d32bd2fb4207777
parent4fb64f13d5101c960a7a234ff2b0b79283de5589
parentc783d8a32e4d958aec6d943d0fa3de2e7d3a68c2
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel