Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 21:12:23 +0000 (22:12 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 21:12:23 +0000 (22:12 +0100)

Trivial merge