[pLog-svn] trunk merging

[Jon Daley]

 	We missed a bunch of changes from the 1.1.1 and 1.1.2 trees. 
Please take a careful look at the next emails.


Merges previously done:

r3968 | mark | 2006-09-14 03:04:16 -0400 (Thu, 14 Sep 2006) | 1 line
Merge from LifeType 1.1.1 branch from SVN rev. 3942:3967.

r3996 | mark | 2006-09-19 13:41:39 -0400 (Tue, 19 Sep 2006) | 1 line
Merge the changes from LifeType branch 1.1.1 (From SVN Rev. 3968:3995)

r4030 | mark | 2006-09-23 13:11:59 -0400 (Sat, 23 Sep 2006) | 1 line
Merge the bugs fix from lifetype 1.1.1 branch (From rev 3995:4029)

r4032 | mark | 2006-09-23 13:36:58 -0400 (Sat, 23 Sep 2006) | 1 line
Merge to recent lifetype 1.1.1 branch changes (4029:4031)

r4091 | mark | 2006-10-05 14:06:53 -0400 (Thu, 05 Oct 2006) | 1 line
Merge from lifetype branch 1.1.1 4032:4088

r4381 | oscar | 2006-12-06 12:41:38 -0500 (Wed, 06 Dec 2006) | 2 lines
merge of revisions 4274 to 4380 (1.1.3 to trunk)


=====
Need lifetype-1.1.1
4100:HEAD


Need lifetype-1.1.2
4131:HEAD