Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Sun, 25 Oct 2009 12:14:56 +0000 (23:14 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sun, 25 Oct 2009 12:14:56 +0000 (23:14 +1100)

Trivial merge