Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge...
authorAndrew Bartlett <abartlet@samba.org>
Mon, 20 Apr 2009 15:19:45 +0000 (17:19 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 20 Apr 2009 15:19:45 +0000 (17:19 +0200)

Trivial merge