merge of 29e89051e9a2c503357df607dde2562d060d5989
authorMatthias Hentges <oe@hentges.net>
Wed, 5 Jul 2006 05:41:24 +0000 (05:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 05:41:24 +0000 (05:41 +0000)
     and 69b99cade429033901bed0a58c27d6c6537ba35b


Trivial merge