merge of bddbb157960dc74708ee1f412dc226c4e119322f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Fri, 11 Aug 2006 16:24:06 +0000 (16:24 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Fri, 11 Aug 2006 16:24:06 +0000 (16:24 +0000)
     and d6d342eb596dfa4dccbd85b8270c275e8e076491


Trivial merge