Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Fri, 18 Sep 2009 21:12:02 +0000 (14:12 -0700)
committerAndrew Tridgell <tridge@samba.org>
Fri, 18 Sep 2009 21:12:02 +0000 (14:12 -0700)

Trivial merge