merge of aca49b567863b4486c3e93b6a74baee4e3679916
authorDavid Karlstrom <daka@thg.se>
Sat, 30 Jul 2005 19:18:53 +0000 (19:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 19:18:53 +0000 (19:18 +0000)
     and f0e0882a2b8b4ba770bd84253b5b9d883303fac7


Trivial merge