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)
     and f987f3f02d0566836caf6a5ae54ac223d0a97609


Trivial merge