merge of 83d79b5cd4fd20054c665e25366f4ee45f3b681f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 21 Nov 2006 11:49:59 +0000 (11:49 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 21 Nov 2006 11:49:59 +0000 (11:49 +0000)
     and 9833bd070799894b4c6befebea43d27d44a56e2a


Trivial merge