Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 23 Sep 2008 04:48:49 +0000 (21:48 -0700)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 23 Sep 2008 04:48:49 +0000 (21:48 -0700)
commitc5265ea3bf493035385fdc9a2bc59a9b0a0bb8f3
tree25472549b25edb55f102cee0f88d5b056761fae7
parentc39d1b829b02d275ea1052afec58ab40f22267a3
parent6660ac5d0ab882e1fd70a72af96b1b1e815b4b14
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel