Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:13:10 +0000 (17:13 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 16:13:10 +0000 (17:13 +0100)

Trivial merge