merge of 8d0e7138b03cf8a4a3b0aae2d6a5a3ffb089b9f4
authorDavid Karlstrom <daka@thg.se>
Sat, 20 Aug 2005 15:54:06 +0000 (15:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 15:54:06 +0000 (15:54 +0000)
     and f1214e1166c21425ad41b398e1fb3bba0decb696


Trivial merge