Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 01:15:08 +0000 (11:15 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 01:15:08 +0000 (11:15 +1000)

Trivial merge