merge of 43de53f09816b4e1e243912e5958a66424c605f8
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Sun, 3 Sep 2006 22:45:25 +0000 (22:45 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Sun, 3 Sep 2006 22:45:25 +0000 (22:45 +0000)
     and ae090523c163ff0d1e234b0d89d1450a2466b4b4


Trivial merge