Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into abartlet...
authorAndrew Bartlett <abartlet@samba.org>
Tue, 11 Nov 2008 00:25:31 +0000 (11:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 11 Nov 2008 00:25:31 +0000 (11:25 +1100)
commit0732ac16634adbce51b1b7fcf9a9d9cd64451276
tree8e91a2cc0181dd602311ebd5ba66cd0d40d3bdca
parent39d42378b260240544b5649ff373fc15fbddaed8
parent4f93e73484580576900d7ff90407d546e724a5ed
Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into abartlet-devel