merge of 3fde30892ae18b3f22391525a8649d85af536c63
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 21 Nov 2006 11:53:58 +0000 (11:53 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 21 Nov 2006 11:53:58 +0000 (11:53 +0000)
     and a8306ea87c57c9a70c96207e04d6adee01ddb94e


Trivial merge