merge of '509968e9aaa6b52420f7ae51e79fa781b449a633'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 May 2008 00:15:15 +0000 (00:15 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 May 2008 00:15:15 +0000 (00:15 +0000)
     and '5ffcacd9125004bbcb65a5f2d933272d313bee84'


Trivial merge