merge of 1077a62e5a0cf3a585d0b28b763970cb1f9495ff
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 20 Feb 2006 14:05:03 +0000 (14:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 14:05:03 +0000 (14:05 +0000)
     and 84f39d6ce58c1d05af73e9efc4431efad132f997


Trivial merge