Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 23 Sep 2008 18:15:46 +0000 (11:15 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 23 Sep 2008 18:15:46 +0000 (11:15 -0700)

Trivial merge