Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)
commit7e9c735b3ca5ab311011a3d5c8f6f90dc56bb5f4
tree855172757e298fb46fa8c6365a3ffe839ad63c4d
parent80e9e63cf611ed45cb2bfb4896f962270e92ee8e
parent4a2e2c0c12e298cb72d4c03e59350393b0a5814f
Merge branch 'master' of ssh://git.samba.org/data/git/samba