Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypto
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 14:11:13 +0000 (16:11 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 14:11:13 +0000 (16:11 +0200)
commitb9890af54691aea05b01346f6e474be1fcd5338c
tree6ddf32540220bda45c055748b98e503a55053dca
parente3ef8803ee46710d080095e4a76e25d3280d6d8b
parent83b0c5d43f568222d97f9b8de985f1e39a375fb9
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypto