merge of 476ae0428965694f00e9493316ccf44da4a20828
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:41:35 +0000 (14:41 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:41:35 +0000 (14:41 +0000)
     and dad0aed1e62cdb5bd930bc9fe478376ea112fb92


Trivial merge