merge of 0c1502175a502035993013e4873d3bc42e40894b
authorDavid Karlstrom <daka@thg.se>
Sat, 20 Aug 2005 15:27:33 +0000 (15:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 15:27:33 +0000 (15:27 +0000)
     and b7f772c18cf37048831c49f4bf9ae001545b201a


Trivial merge