Merge branch 'master' of git://git.samba.org/samba into convenience
authorJelmer Vernooij <jelmer@samba.org>
Mon, 2 Mar 2009 03:15:11 +0000 (04:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 2 Mar 2009 03:15:11 +0000 (04:15 +0100)

Trivial merge