merge of 1d04ef5038d67cd195b55d02d4973c0a4a074264
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 9 Aug 2006 13:07:57 +0000 (13:07 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 9 Aug 2006 13:07:57 +0000 (13:07 +0000)
     and 4c592719442f4293fbdcccad6c024f161bedb8c8


Trivial merge