Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 24 Feb 2009 00:02:45 +0000 (01:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 24 Feb 2009 00:02:45 +0000 (01:02 +0100)

Trivial merge