merge of '6696df101b8a0383c5cf30d534475ac1dc4d0866'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 15:57:19 +0000 (15:57 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 15:57:19 +0000 (15:57 +0000)
     and 'bdcb3d240662ee2deb3443ec573736ad9e723764'


Trivial merge