merge of '42b98a213761be9213d2d8438b252c41523837d5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 5 Dec 2006 12:28:35 +0000 (12:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 5 Dec 2006 12:28:35 +0000 (12:28 +0000)
     and '78bde69685836f66ab0435bf676c6e25cb1e8d1a'


Trivial merge