merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 14 Jul 2006 12:22:41 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 12:22:41 +0000 (12:22 +0000)
     and bf485b02c3a40cf5e773106c4aff28ebea2e1a2e


Trivial merge