Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
commit6e17a56039be13ac1ef7004f15d154141bad7196
tree320fe14961cf01c00eb3fa38b8bb27bdc2643327
parent22a4129fabf70e01cc638c2f7347c28201838830
parent642424b3779dd33cd2b5049789aa16e678438bb9
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test