Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 30 Sep 2008 20:02:09 +0000 (13:02 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 30 Sep 2008 20:02:09 +0000 (13:02 -0700)

Trivial merge