Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 23:28:06 +0000 (15:28 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 23:28:06 +0000 (15:28 -0800)
commitca1653e830f8340f6188bbfa9fb2cb00e9e84fca
treebb1c6741f8a1788acb9fa74d2aa3b026085675e0
parenta028e9640b54554f4ae036f46cc16ae73f00884e
parent28fb708ba0bf3c81e54b1f99a8f56d671e62a047
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba