merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
authorDavid Karlstrom <daka@thg.se>
Wed, 3 Aug 2005 16:47:05 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 16:47:05 +0000 (16:47 +0000)
     and b4b0bf82b4d08e6569292df80471f3ac9b750c0c


Trivial merge