Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitb4dc70f3bd79505de0e66283bf6d312dd3b53b27
authorJeremy Allison <jra@samba.org>
Mon, 12 Jan 2009 18:47:02 +0000 (12 10:47 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 12 Jan 2009 18:47:02 +0000 (12 10:47 -0800)
treef7457bc1b9b5ed2aebd6c7429e8bd889a290aa24
parent62d547e1b853b6c5c871f1f9cb265d3cdd40a21d
parent38b297f99ec166e5c40ba33774222b37b45b4fec
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test