Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 9 Feb 2009 18:44:50 +0000 (19:44 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 9 Feb 2009 18:44:50 +0000 (19:44 +0100)

Trivial merge