merge of '351a1d2f8971414b26915d2d5c883576729b53f9'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 7 Apr 2007 06:31:31 +0000 (06:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 7 Apr 2007 06:31:31 +0000 (06:31 +0000)
     and 'c6346a6de5d825ca4ddd2b7129cbcaeaf371c86a'


Trivial merge