merge of 827f4059e04553066f724435440d24ddd9d922cb
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 19 Jan 2006 20:01:55 +0000 (20:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 19 Jan 2006 20:01:55 +0000 (20:01 +0000)
     and 9b2d4fdceb2f6fd916a463de425a0480831dd0af


Trivial merge