Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 10:37:27 +0000 (11:37 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 10:37:27 +0000 (11:37 +0100)

Trivial merge