Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 18:08:00 +0000 (20:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 18:08:00 +0000 (20:08 +0200)

Trivial merge