Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commitaef0bdc6a1ffdf746ce9ce27c45b3ca4f6593ba9
authorJeremy Allison <jra@samba.org>
Wed, 1 Apr 2009 21:03:17 +0000 (1 14:03 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 1 Apr 2009 21:03:17 +0000 (1 14:03 -0700)
treefc5fc5852fc59fd41536ca33cae3ebe0b2b330c2
parenteaddcfef1ba553744ae9293feaf7585ec9aaa0db
parent01a942d8ab5b5e430eb928dd58626fe16b9b04fe
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba