Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Wed, 4 Mar 2009 03:10:41 +0000 (14:10 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 4 Mar 2009 03:10:41 +0000 (14:10 +1100)

Trivial merge