Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 26 Jan 2009 17:14:41 +0000 (18:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 26 Jan 2009 17:14:41 +0000 (18:14 +0100)

Trivial merge