Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 03:19:53 +0000 (13:19 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 03:19:53 +0000 (13:19 +1000)

Trivial merge