Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
commit596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954
authorAndrew Bartlett <abartlet@samba.org>
Thu, 23 Oct 2008 01:56:30 +0000 (23 12:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 23 Oct 2008 01:56:30 +0000 (23 12:56 +1100)
tree06371bc9dcf7a876ed88575b6621889b4a6e6120
parente79835b096c716124ac5d6e78610e5a76172e649
parent2f1dbddc3f5433b5b5c542cd3c8fa3050499d8e9
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel