Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 9 Feb 2009 15:51:46 +0000 (16:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 9 Feb 2009 15:51:46 +0000 (16:51 +0100)
commit9b366d703210b493aa1389bbdd288a2b00958766
tree12acaf89af2c6bd2610018d267e2d8030d9b4bd6
parent6d139ca4680abcbda5110f2f0886aa038ff62088
parent1dadf17be847e3f93b72988bcc7e8620a8d5908c
Merge branch 'master' of ssh://git.samba.org/data/git/samba