Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 12 Feb 2009 15:00:46 +0000 (16:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 12 Feb 2009 15:00:46 +0000 (16:00 +0100)

Trivial merge