Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 04:50:08 +0000 (05:50 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 04:50:08 +0000 (05:50 +0100)
commit7a0e5de08d487108c604b4bab8a2c8e689808d9f
tree6f48deb16139fd705800389fe2e454cb596b6f45
parentc537f7a91449728bbffdda628877f72db2d4e96b
parent334d590b5e769a7e893c59f06ebc5f44e76d13a6
Merge branch 'master' of ssh://git.samba.org/data/git/samba