merge of b4d676ca1731d058a9e6796e021b076ade646392
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 2 Aug 2006 15:04:18 +0000 (15:04 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 2 Aug 2006 15:04:18 +0000 (15:04 +0000)
     and e721389595223c9f6bdea1c71cffa6a144b92e72


Trivial merge