Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 17:40:06 +0000 (18:40 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 17:40:06 +0000 (18:40 +0100)
commit715cc00bc01e151c10e3d723cd29e126a6464637
tree538017d459e7531a726e34767c0abcbe5e683faa
parent293acaf92e7234665e15c3fb7fd600427ffcd5ce
parenta868d2f3d5281dea923718486e4e42b20cf8fe74
Merge branch 'master' of ssh://git.samba.org/data/git/samba