Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jan 2009 14:51:46 +0000 (15:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jan 2009 14:51:46 +0000 (15:51 +0100)

Trivial merge