Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 13 Oct 2008 14:30:40 +0000 (16:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 13 Oct 2008 14:30:40 +0000 (16:30 +0200)
commit2ce72b5a69e3cf306277460a6d87754bf71c024b
tree667137b43d168d61831b4903d5bf74ef9f79d19f
parenteaba7784160be9dcf40f57c30c6f01a691082ba6
parent345e731fc10b779204b699076876e89237da6cdb
Merge branch 'master' of ssh://git.samba.org/data/git/samba