Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000 (14:57 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000 (14:57 -0700)
commit272134b759c26127e25a189a77d61af32de63111
tree2c363739c870898d3f37a6b2d969b00ff7d9953f
parentcb40b1ae83cf689e95e03f2d2d3fccc666dc4472
parentb4c708cb940bc16f72b939f0e5b217154d834000
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
(This used to be commit a03b0dde01e4cebe07a65af3943d178dbdeda276)