Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)
commiteba7f1032d79fe5dcbc1902e3af1087399f67a5a
tree1dc910d68153243e1ab7a5c7e455a6e2daec5cc4
parentb39b6099a44ef40fc79fc68c9df740e0ef722d19
parent9cf1a68977d56d342ca7dbe8f07c725221dc1148
Merge branch 'master' of ssh://git.samba.org/data/git/samba