Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:57:09 +0000 (03:57 -0700)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:57:09 +0000 (03:57 -0700)

Trivial merge