merge of '00ba67c01fec8b792eb0346153ef79f8f229476c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 11:22:13 +0000 (11:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 11:22:13 +0000 (11:22 +0000)
     and '2639e56359995013fb0dca41ec273945a04fc8a4'


Trivial merge