merge of 4afeb65d2d724da6938ccfa96b35c1dcbaa40f26
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:26:18 +0000 (14:26 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 22 Aug 2006 14:26:18 +0000 (14:26 +0000)
     and e6ffd04153758be5656011ba47b7a327af58ec5f


Trivial merge