merge of '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 Apr 2008 15:20:19 +0000 (15:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 Apr 2008 15:20:19 +0000 (15:20 +0000)
     and 'c48f66ff9ccc3311bacc8bb4a4c4ed79893a63d4'


Trivial merge