merge of 6944b5095dc4e51204d347f835d2582dd53a3453
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Thu, 15 Jun 2006 20:07:59 +0000 (20:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Jun 2006 20:07:59 +0000 (20:07 +0000)
     and dce80cc984382186d77b2f734df55dc524fab331


Trivial merge