Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)

Trivial merge