merge of a2b72038a75fbaa0877614758b62b3787a0937a4
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 8 Aug 2006 16:36:52 +0000 (16:36 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 8 Aug 2006 16:36:52 +0000 (16:36 +0000)
     and ade4046c4fc13b91526f334d6ca6f33972b6ff8c


Trivial merge