Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2009 02:15:53 +0000 (13:15 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2009 02:15:53 +0000 (13:15 +1100)

Trivial merge