merge of '9f20206493b0337a84d74f61b27b34138e7ea9f3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Jun 2007 15:50:15 +0000 (15:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Jun 2007 15:50:15 +0000 (15:50 +0000)
     and 'a0dce4b014a5345488a3702f0af98e5eb36ae053'


Trivial merge