merge of '12528b74949ac903af2d3960e26a8ede5eaa5648'
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 5 Apr 2007 07:03:57 +0000 (07:03 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 5 Apr 2007 07:03:57 +0000 (07:03 +0000)
     and '88e7fc4e578d475704012a657d1e7ab9ddf30a7d'


Trivial merge