Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:58:21 +0000 (03:58 -0700)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:58:21 +0000 (03:58 -0700)

Trivial merge