merge of 9ecdfad028b0756ef24d34ae5fcfb39a2f62a0fb
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 17:24:16 +0000 (17:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 17:24:16 +0000 (17:24 +0000)
     and afbcaf9595662eb4d73b1df884babe912481d2a3


Trivial merge