Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:21 +0000 (09:29 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:21 +0000 (09:29 -0700)
commit882297edc024c146f24fc9f847d2b0b813f93fc7
tree89e33d18edfbe6f8874170f96dc457c49f7a4a7c
parent4f60348c0a934123a8e15bc741076366f6713390
parent8343dd5c3a124b9c705f2b71e3747542e193da7e
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel