merge of 9bbf3b49428861667fd03d8e2eea47c7348e91bb
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 09:06:31 +0000 (09:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 09:06:31 +0000 (09:06 +0000)
     and 9cc938ac7d8bab2bd41cb94d8c11a81bfbf6dabe


Trivial merge