merge of 7977b8ce284c880bc8392583f70a410d660e9c7f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:36:33 +0000 (14:36 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:36:33 +0000 (14:36 +0000)
     and bd9490f3e5b47d7aa5f58032d480a8d192520a4b


Trivial merge