Merge branch 'master' into new
commit96535e615db869f096686b0ce8e79e30dec7ad25
authorPaul Mackerras <paulus@samba.org>
Tue, 30 May 2006 11:35:07 +0000 (30 21:35 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 30 May 2006 11:35:07 +0000 (30 21:35 +1000)
tree4961b148777af04b318163c30ef636e695bf3786
parent4e7d677949e8ee7617e42f10c1ddf5cd2adee3a1
parente54be9e30ffb8ab21fe9ef740991940f4d00e79c
Merge branch 'master' into new

Conflicts:

gitk
gitk