merge of '21e9dd88b8f6dc59e8389b4b65879eb68d306057'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 18 Jun 2007 11:50:00 +0000 (11:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 18 Jun 2007 11:50:00 +0000 (11:50 +0000)
     and '73e558bb958b00e280e1294e4581070623ff6e3c'


Trivial merge