Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
commit551e95502765bae58d5ccf57635e4977b7b47b9b
authorAndrew Bartlett <abartlet@samba.org>
Tue, 14 Oct 2008 00:16:59 +0000 (14 11:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Oct 2008 00:16:59 +0000 (14 11:16 +1100)
treed0c797cbc5044a882e1aac6094f661edb2c070d1
parent9dcbddd5c61e8bf2814e97e53e7c518df87661c0
parent4746f79d50d804b0e9d5d5cc0d4796dee54d052c
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel