merge of 0241e7bd233c727dc013a20bd6cbfadd4a2a04dc
authorDavid Karlstrom <daka@thg.se>
Wed, 3 Aug 2005 07:29:11 +0000 (07:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 07:29:11 +0000 (07:29 +0000)
     and 9b92b607ea4961e9ebb9ee801dfb76e3bf258ed4


Trivial merge