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)
commita03b0dde01e4cebe07a65af3943d178dbdeda276
tree370621a48eb208c45d8c6a361fa4a30db8cbccba
parentb81a4dd003957a611ea190979d828b75d07a1f80
parent295bfb6af8153e91ae881e2437cc707d5736bc97
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel