merge of bc169bc13b3f82a8d9bdcfabcc2997d7948dab82
authorDavid Karlstrom <daka@thg.se>
Wed, 3 Aug 2005 14:44:30 +0000 (14:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 14:44:30 +0000 (14:44 +0000)
     and dd81e6f6b559f73661084d4c0e7d2a7a36a7404e


Trivial merge