merge of 0a9016d47dc74f75d91c7ff85ed9b69f3d1cc8f8
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 26 Jul 2006 23:41:12 +0000 (23:41 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 26 Jul 2006 23:41:12 +0000 (23:41 +0000)
     and 2a31a16647e31d6ebc8073aec234852c37532efe


Trivial merge