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

Trivial merge