Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)
commit3482cd9b0e81bbc801f1cec33fca82fc45a3ddef
tree9770312d9e9a9e5a4635878c4b4b148a24943ad4
parente2345ce90c3f1548f63d720c5943c8d61fdc899a
parent0f14357c86aee9a76ffbb45ea6419f4cc4106d62
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test