merge of 'c46f8208c373d5560ddd45271e743c4c230bd2cd'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 May 2007 13:21:27 +0000 (13:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 May 2007 13:21:27 +0000 (13:21 +0000)
     and 'f261cf941f77cd9c8da55b02b29790fe6ade119d'


Trivial merge