merge of 'e7503adc20d2a854905f468365cd82066ebed0d5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 15:11:51 +0000 (15:11 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 15:11:51 +0000 (15:11 +0000)
     and 'f380086d173615489f21da520bb5d47e43ad2e47'


Trivial merge