Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Sat, 14 Feb 2009 00:07:07 +0000 (16:07 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 14 Feb 2009 00:07:07 +0000 (16:07 -0800)

Trivial merge