Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 10:20:37 +0000 (12:20 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 10:20:37 +0000 (12:20 +0200)

Trivial merge