merge of 4456e15f23db9a9f052dfcc702caeb50db1ee867
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 21:56:36 +0000 (21:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 21:56:36 +0000 (21:56 +0000)
     and 6a067ebc597af5f7a5d22be5966896abfeea9182


Trivial merge