merge of '2a95914087586c7f511061dd7404c0f44fc9ce24'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:54:14 +0000 (19:54 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:54:14 +0000 (19:54 +0000)
     and '595d3bb20485f41ca08f2f400d9c3a3c7106db90'


Trivial merge