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

Trivial merge