merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 31 Jul 2006 15:36:05 +0000 (15:36 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 31 Jul 2006 15:36:05 +0000 (15:36 +0000)
     and bbd3a2811e13a3b99224c1a846af2a244d292c41


Trivial merge