merge of '99cbcc8e87c723d0a9e1a7c858d8001fc155c6ec'
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Jun 2007 02:57:36 +0000 (02:57 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Jun 2007 02:57:36 +0000 (02:57 +0000)
     and 'b3a5d98a7f1c8586a53bf99549d0abe02ce9d8b4'


Trivial merge