merge of 494c257ade51ecd2039f966953f2f83ab5fbb95c
authorDavid Karlstrom <daka@thg.se>
Sat, 23 Jul 2005 15:57:13 +0000 (15:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 15:57:13 +0000 (15:57 +0000)
     and cbe32b306c5e7609bbe24ffbbb6c1f179f6bede5


Trivial merge