merge of 42d69359113ca4019c6288abe81bcb0e233a958a
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 17:28:10 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 17:28:10 +0000 (17:28 +0000)
     and 6ae384bbffeb51d8f91602afdfe7f88512e52854


Trivial merge