Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 15:38:42 +0000 (17:38 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 15:38:42 +0000 (17:38 +0200)

Trivial merge