Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Thu, 5 Mar 2009 00:11:19 +0000 (11:11 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 5 Mar 2009 00:11:19 +0000 (11:11 +1100)

Trivial merge