Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 26 May 2009 04:18:16 +0000 (14:18 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 26 May 2009 04:18:16 +0000 (14:18 +1000)

Trivial merge