merge of '3138c13a7a9b08f8cfb5650c96e544ad82b3b84a'
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Jun 2007 03:11:08 +0000 (03:11 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 27 Jun 2007 03:11:08 +0000 (03:11 +0000)
     and '4c78f5500334d26f8fcbdeda6f4a013b43269e86'


Trivial merge