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

Trivial merge