merge of f81152e068aff509b6a52bcc8ada77a0a0c1f09e
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 22 Sep 2005 14:12:48 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 14:12:48 +0000 (14:12 +0000)
     and ab4108f74e6e141a9205e560ab76a02ddff2604f


Trivial merge