merge of 8296491e9a6698946dcd0f0fe1002e56eab01cdc
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 3 Sep 2005 12:09:42 +0000 (12:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 12:09:42 +0000 (12:09 +0000)
     and 9fd3eb06066308e4db4d8943596c93a38f87f440


Trivial merge