merge of '3da2caa6a3dac230f20ffcd1b963e933f744dbfa'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Dec 2006 12:14:56 +0000 (12:14 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Dec 2006 12:14:56 +0000 (12:14 +0000)
     and 'bde1fc713ea75f24b1ec8863e0cb558101ee3c06'


Trivial merge