Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Sat, 4 Oct 2008 20:56:20 +0000 (13:56 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 4 Oct 2008 20:56:20 +0000 (13:56 -0700)

Trivial merge