merge of e5fc9068f8cf1cbab5a9388e11725f13093edecf
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 21 Aug 2006 15:12:39 +0000 (15:12 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 21 Aug 2006 15:12:39 +0000 (15:12 +0000)
     and ea9b59951b121a56e58b685121cca7b6ddca895e


Trivial merge