Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)

Trivial merge