Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Jul 2009 15:39:23 +0000 (17:39 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Jul 2009 15:39:23 +0000 (17:39 +0200)

Trivial merge