Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 23:28:06 +0000 (15:28 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 23:28:06 +0000 (15:28 -0800)

Trivial merge