Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 23 Sep 2008 04:48:49 +0000 (21:48 -0700)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 23 Sep 2008 04:48:49 +0000 (21:48 -0700)

Trivial merge