merge of '9c656e60411087235cb8e41b6b3ae676447fa38a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Aug 2008 14:05:09 +0000 (14:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Aug 2008 14:05:09 +0000 (14:05 +0000)
     and 'df7aebb70b0a281903694dd4a1221fae63e2c7b6'


Trivial merge