Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 31 Mar 2010 17:01:03 +0000 (10:01 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 31 Mar 2010 17:01:03 +0000 (10:01 -0700)

Trivial merge