merge of '909c507b800748c820ddc73a2c5bed204cbdbd65'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 23 Apr 2007 16:51:13 +0000 (16:51 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 23 Apr 2007 16:51:13 +0000 (16:51 +0000)
     and 'de1c6225e9834b778c351b84978458d315dbbcb5'


Trivial merge