Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
authorJelmer Vernooij <jelmer@samba.org>
Wed, 25 Mar 2009 19:51:29 +0000 (20:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 25 Mar 2009 19:51:29 +0000 (20:51 +0100)
commit9a61758c1e3b3893fda1aca5dae291d86cec82e3
tree9b96685d6439a00617e19f502389e40d6f3dfe5e
parentca202cf464aec82e63be4b2160f394f56b8c195e
parent365b5cfcbeb041ce84718717f30ac02183c9af7f
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec