merge of 4032c1797996f6e321707d68ac4cb1989dae28cd
authorDavid Karlstrom <daka@thg.se>
Sat, 30 Jul 2005 21:21:12 +0000 (21:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 21:21:12 +0000 (21:21 +0000)
     and 674017eb4dff8527f93f526834e8c7e766e1f8a3


Trivial merge