merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:35:33 +0000 (14:35 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:35:33 +0000 (14:35 +0000)
     and '843d33548c0e77469b4859dd4e3b8c77590cb762'


Trivial merge