Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Mon, 14 Sep 2009 20:24:07 +0000 (13:24 -0700)
committerAndrew Tridgell <tridge@samba.org>
Mon, 14 Sep 2009 20:24:07 +0000 (13:24 -0700)

Trivial merge