Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 29 Oct 2008 20:27:59 +0000 (13:27 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 29 Oct 2008 20:27:59 +0000 (13:27 -0700)
commit7c5f369fafee42b555c3e2b3e3482689b508fe4a
tree866b602ba8fe9a5914b0fcfba4ff844253230297
parent7c53ffea28a5752bf28c23b4741ceba77ff1fe1f
parentc7dcf7da55224bc2b704d8c86ba4867c251e9eac
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba