merge of f1ee0327eee91259e262ed28b04a96ddf20d8b7c
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 7 Sep 2005 09:46:09 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 09:46:09 +0000 (09:46 +0000)
commit60e4096ee61a290969982df4a22d53a4fc56cd34
treefa8b2937ad91195295681ccd0785ca0c3d667751
parent28e286f2287e335dcf48ef9cf945b58b8565b0c4
parentca0b96e04d756291ad42ebab994b1daf8671af9f
merge of f1ee0327eee91259e262ed28b04a96ddf20d8b7c
     and f987f3f02d0566836caf6a5ae54ac223d0a97609