merge of 629adcaf78ed27ef81715e0e1b0ba32f4fb9ee20
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Sep 2006 19:49:07 +0000 (19:49 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Sep 2006 19:49:07 +0000 (19:49 +0000)
     and f1eebc8126f71376848293407e13215310c13e8c


Trivial merge