merge of 13b17dd6e347702d1e84e963d6be4b3e8146a6a2
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 3 Sep 2005 09:52:47 +0000 (09:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 09:52:47 +0000 (09:52 +0000)
     and 8a85b8d7add60782508f9f1f1501b4c45fb13123


Trivial merge