Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 24 Apr 2009 07:17:08 +0000 (09:17 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 24 Apr 2009 07:17:08 +0000 (09:17 +0200)

Trivial merge