Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 3-2-nopipeindex
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 18:52:17 +0000 (20:52 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 18:52:17 +0000 (20:52 +0200)
commit9028f9e065536594df901ae4aac900102f2d85f6
tree354183cb4892687c3cef699f9c5b45c8e9cafdc5
parent7bea00dca1ee08ef731dfa73110ef9c190a29919
parent6bb107b17d557c27d035ca518ab61296814a3cea
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 3-2-nopipeindex