Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Tue, 15 Sep 2009 17:02:04 +0000 (10:02 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 15 Sep 2009 17:02:04 +0000 (10:02 -0700)

Trivial merge