Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit2ccc176bf8ab7490eb3be818776c1e20b2f153a9
authorJeremy Allison <jra@samba.org>
Thu, 15 Jan 2009 23:53:23 +0000 (15 15:53 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 15 Jan 2009 23:53:23 +0000 (15 15:53 -0800)
tree402da12ce9f58c5a477f7894174147b10aa56036
parent45e6f9c5a4b5d9cdb89f398f1238872251ccbe54
parent51e34b38959115e8a04795837b5c5983dc8d824c
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test