Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
commitd206517f90ac02e829193c5a17e5df25059cf18d
authorAndrew Tridgell <tridge@samba.org>
Wed, 4 Jun 2008 16:25:16 +0000 (4 09:25 -0700)
committerAndrew Tridgell <tridge@samba.org>
Wed, 4 Jun 2008 16:25:16 +0000 (4 09:25 -0700)
tree0c2ddb7121a05e23cbd8bb5da8ce10eb66e89fcc
parent9d74201e462f2f95ed5bd91200681db3bd2a9277
parentfeca16dd6d03730b4a67adf5d912ba2d5e1a3025
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
source/lib/crypto/config.mk
source/lib/crypto/crypto.h