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

Trivial merge