merge of 7df389f1eac3887a08aa90c06c5abb20cd46ee79
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 29 Apr 2006 15:31:04 +0000 (15:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 29 Apr 2006 15:31:04 +0000 (15:31 +0000)
     and d73fbf99ff9ab2f08a1a7727c83b74f21bbd896d


Trivial merge