merge of 06626817d6e4c48c4f1832c0f65a5736087ed3df
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 8 Aug 2006 16:29:49 +0000 (16:29 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 8 Aug 2006 16:29:49 +0000 (16:29 +0000)
     and af0f25bad53ac40966623922f300d0010d5bddcd


Trivial merge