Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:27:50 +0000 (19:27 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:27:50 +0000 (19:27 -0800)
commit1a89b9f5f3d0e99363b333a1068c1043b65cfb99
treec99d9faf3f590bb31d801033c7f6cd1d8a1495ad
parent6f0be6c5d580ea751b28a0166b4454a0ef333dc2
parent9efed3b93632fcb934fa548194536802dcc3c287
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba