Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
commitebe5b2835331ab259dd32bf6dc574ae999e2d36d
authorAndrew Bartlett <abartlet@samba.org>
Thu, 5 Mar 2009 00:11:19 +0000 (5 11:11 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 5 Mar 2009 00:11:19 +0000 (5 11:11 +1100)
treeb7ce49ef619de869dd03bfd48b65f0fa175b0f33
parent5a10d804919af205b027ee519b9fa05519913ebe
parentf85aa66ca22f29734bdacaa559737990fbe28d8a
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel