Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
commit0d222a692442d01eb24b20735e6020bd2ce47738
authorAndrew Bartlett <abartlet@samba.org>
Fri, 13 Feb 2009 05:56:35 +0000 (13 16:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 13 Feb 2009 05:56:35 +0000 (13 16:56 +1100)
treed3a4ed550d2c1d76e64f4562341e4b8d904939a0
parentcd6026135d3dc7eaa773c60aa168bae8f3f15502
parent99b45f71ccb832b712af6badd28457edf351d0db
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel