merge of 425cf1b391611c169a1c3b78f1fe86df088902b9
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 4 Dec 2006 18:42:00 +0000 (18:42 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 4 Dec 2006 18:42:00 +0000 (18:42 +0000)
     and 87eec7927f92f34a08ce624f3ff7f4cc85645fd2


Trivial merge