merge of '47a018f2318445ba4e71d5969574adb98e48f062'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:20:42 +0000 (14:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:20:42 +0000 (14:20 +0000)
     and 'f6cc9b68982be345f6c9c58f1cc5894d7d878d10'


Trivial merge