merge of 04264e63d95f7b157030356df1acd2c861ecf54d
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 14 Aug 2006 23:20:25 +0000 (23:20 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 14 Aug 2006 23:20:25 +0000 (23:20 +0000)
     and 0fb74741994c40f954b3aef2f855c14636c49ccb


Trivial merge