Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 25 Feb 2009 01:33:47 +0000 (17:33 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 25 Feb 2009 01:33:47 +0000 (17:33 -0800)

Trivial merge