merge of 250cd456777a4f049b651042f91adad919b1c05c
authorDavid Karlstrom <daka@thg.se>
Sat, 20 Aug 2005 14:55:41 +0000 (14:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 14:55:41 +0000 (14:55 +0000)
     and a2acaaf484c0fd43ed4d97a2542d974cb56362d1


Trivial merge