Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Fri, 11 Sep 2009 13:27:52 +0000 (23:27 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 11 Sep 2009 13:27:52 +0000 (23:27 +1000)

Trivial merge