Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 23:40:05 +0000 (15:40 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 23:40:05 +0000 (15:40 -0800)
commit4283ae489b6e227beba196e8a315a9727f03cc07
tree7308561653b9e52eab8fc13181c0ad41ae2da208
parentf9bb8fbe832409893b17f2113d7b35b9ffe91540
parentd031472227b44d040698e6dff52dc79028fde854
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba