merge of '6c7f9afdafc67f5e5a8263301ca0cfce430be173'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 21 Mar 2007 23:22:30 +0000 (23:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 21 Mar 2007 23:22:30 +0000 (23:22 +0000)
     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'


Trivial merge