Merge branch 'master' of git://git.samba.org/samba into HEAD
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 04:46:15 +0000 (05:46 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 04:46:15 +0000 (05:46 +0100)

Trivial merge