Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 14 Oct 2008 00:27:53 +0000 (17:27 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 14 Oct 2008 00:27:53 +0000 (17:27 -0700)
commit501fa6a05db1b2c29b1e4720a03ed219aee2a346
tree21841c344f878f9ba8af2fb06018933f70069f22
parentddf16ed6e5d68870cdf3b8c6358af5134a694fc4
parent7e5bbe806958ea8176e4c8494e3b3f79570635da
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba