merge of 'd047390e8b0dc8fd0841e35eb34a740bf2cbdabf'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 17 Jun 2007 13:48:53 +0000 (13:48 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 17 Jun 2007 13:48:53 +0000 (13:48 +0000)
     and 'e75f98276049e6febbf34bf319c4497eec7a0748'


Trivial merge