merge of a60d3fd56109a66320e32c0f8aa0af61036586a2
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 22 Sep 2005 21:34:06 +0000 (21:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 21:34:06 +0000 (21:34 +0000)
     and d08b1028598c89e26738182a8271ca038bd0f5b5


Trivial merge