Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Sun, 25 Oct 2009 12:14:56 +0000 (23:14 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sun, 25 Oct 2009 12:14:56 +0000 (23:14 +1100)
commit98a3725252aabeece2b31f87e1c6cfc543fc716d
tree2365b53965e23fff5f703be80329799eec3b630a
parent12c9af78179b71721e30b03ae9fc0edd7cda940b
parent1ea460b0b0dc4ee8a14c764e81f368d4f7e9ff45
Merge branch 'master' of ssh://git.samba.org/data/git/samba