merge of '1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 23:24:39 +0000 (23:24 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 23:24:39 +0000 (23:24 +0000)
     and 'a9ff99e803ab2437983f68e64198879cfb336247'


Trivial merge