merge of '033a134d8063d99bff7b1df1b0d14984874b7b2c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Dec 2006 12:12:34 +0000 (12:12 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Dec 2006 12:12:34 +0000 (12:12 +0000)
     and '2828d9465b54e6e0cd311dd4e9abd7f83eef4718'


Trivial merge