Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 16 Dec 2008 21:35:44 +0000 (13:35 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 16 Dec 2008 21:35:44 +0000 (13:35 -0800)
commitcf96098a4868d21752dad2add8fe1dee22fce7ff
tree9c2e01c97a5fdff20fbf46623410a386d9d0b2bd
parent3edbc14405c867d6cde1771124d885feae9a590a
parentcc2d1eb743bb5b49b88a6fbdfeeb8730fb8e6189
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba