merge of 7e5aec0634897d3c7afdf3aebe3c28008e54239b
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 08:14:51 +0000 (08:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 08:14:51 +0000 (08:14 +0000)
     and 8ba34c2a2418ae3ae68c35cd0c6a9b535ec1178b


Trivial merge