merge of 57c7ff1bca3e3d0423fe776b6cdf466b16f29e50
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 20 Nov 2006 23:40:40 +0000 (23:40 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 20 Nov 2006 23:40:40 +0000 (23:40 +0000)
     and d2393507d64bd7596d8c8cf859ad39de4bc4ed65


Trivial merge