Merge branch 'master' of git://git.samba.org/samba into convenience
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:29:04 +0000 (17:29 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:29:04 +0000 (17:29 +0100)

Trivial merge