merge of 39d6becf1562e4912199977590a3a075431287ac
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 16 Mar 2006 16:04:55 +0000 (16:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Mar 2006 16:04:55 +0000 (16:04 +0000)
     and 891ff1a9417a644b5b3fc9a96299e4ba2a0ca442


Trivial merge