merge of '6da9d621bc47b3a3cb21e8d3a666f30c5cec58e1'
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 5 Apr 2007 23:04:16 +0000 (23:04 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 5 Apr 2007 23:04:16 +0000 (23:04 +0000)
     and 'dc66d28f2407d4b483ec5e09566d9787024f3b80'


Trivial merge