Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 02:34:54 +0000 (04:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 02:34:54 +0000 (04:34 +0200)
commit4b942c2a7298987bbc596e89197ba76617580221
tree3dd5b4ec259f09f32f2d9aaacc3d1433194420f1
parent6a689c23e83fef71a562a9009b92983d750f63cc
parentb7d2ff38f54250db52c495d26a2b2923e5dcc83e
Merge branch 'master' of ssh://git.samba.org/data/git/samba