Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 14 Nov 2008 02:34:31 +0000 (13:34 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 14 Nov 2008 02:34:31 +0000 (13:34 +1100)
commit62f67bc5564a3ec10a86388c6871245fafa63bcb
tree67f8c45e4871a1b7404a1411c63fdd27c25f5ad9
parent5b0eb54add750c926d6db2fcb8e8e6066eeed237
parent4c7033df5da52bded995f3e4cccd0b78bf55a74f
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel