merge of '56948314f3a66d76e956852342e56aa3503b0c1d'
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Sun, 4 May 2008 18:35:42 +0000 (18:35 +0000)
committerKristoffer Ericson <kristoffer_e1@hotmail.com>
Sun, 4 May 2008 18:35:42 +0000 (18:35 +0000)
     and '5c2296b573461f137ca8fbc5fc75fd1c254615af'


Trivial merge