Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit4977d913ed54935383155f7b2045fd6679bacc33
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 15:18:06 +0000 (21 16:18 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 15:18:06 +0000 (21 16:18 +0100)
treecbd999112ec3ab851ea5be170cc0a453605c713f
parentf3ecb701335b1129947127d4c45eef970b66875c
parentb319549f129b1c79afc9bfd4a84f2730b96d69a3
Merge branch 'master' of ssh://git.samba.org/data/git/samba