Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitd891d0563974ba7d91752b8b15712eb79cf4e387
authorJeremy Allison <jra@samba.org>
Tue, 12 Aug 2008 21:10:52 +0000 (12 14:10 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 12 Aug 2008 21:10:52 +0000 (12 14:10 -0700)
tree8c93791d93a3057b728ba60ed6890acc7edee852
parent736bdf15d934028b579a02dc411aed6c14a437f3
parent39d7dab19ad7aa97ef8691cd3704ab976510aa78
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test