merge of '1213079d1b0cc83ff10f588ca0b547a3c117bbe5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 18:30:39 +0000 (18:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 18:30:39 +0000 (18:30 +0000)
     and 'd82c8a6b3b1ea13ae5fd256983ca2930af242c83'


Trivial merge