Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 Jan 2009 02:39:54 +0000 (13:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 19 Jan 2009 02:39:54 +0000 (13:39 +1100)

Trivial merge