merge of '338ea31d4809a6db514f8ee9dbd35db2c426e83f'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 02:13:29 +0000 (02:13 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 02:13:29 +0000 (02:13 +0000)
     and '33ef958347850ae3830b2326a4476282484717bd'


Trivial merge