Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit082ba6a1ad3a68aff118d96f855a2aa65eaeb359
authorJelmer Vernooij <jelmer@samba.org>
Thu, 12 Feb 2009 15:00:46 +0000 (12 16:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 12 Feb 2009 15:00:46 +0000 (12 16:00 +0100)
treed70b7e8012e787a11ea1c12224318643cdd552c3
parent762fdc8c5c2db304f3dc4536c19d69366d1399df
parent4f6d1728254c8503e71c6fdd008fb7264dec26c5
Merge branch 'master' of ssh://git.samba.org/data/git/samba