Revision 978 - (download) (as text) (annotate)
Thu Feb 8 02:07:10 2007 UTC (6 years, 3 months ago) by cauld
File size: 16444 byte(s)

! Merging revisions 918 thru 975 from the 4.6 branch into 4.7.  Quite a big merge with a lot of conflicts needing manual resolution because of all the updates happening in 4.6.