merge of '7515f43924dd61866be5833ca02d8cc7252e7ebc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 17 Dec 2007 10:22:06 +0000 (10:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 17 Dec 2007 10:22:06 +0000 (10:22 +0000)
     and 'f88bbdd4b314a31b08b342dd74417b7202cb5c26'


Trivial merge