merge of 336c2756d6daa832106c29d9ab7c874fcd6815d7
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Sat, 19 Aug 2006 18:41:04 +0000 (18:41 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Sat, 19 Aug 2006 18:41:04 +0000 (18:41 +0000)
     and cb591f5b883733fa2368b93267c8b93a727fa2c7


Trivial merge