Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 19 Jun 2009 05:38:33 +0000 (15:38 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 19 Jun 2009 05:38:33 +0000 (15:38 +1000)

Trivial merge