merge of 3c138aa1bdcdf1ce187405d9531d4ad94efa34a2
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 27 Feb 2006 13:39:29 +0000 (13:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Feb 2006 13:39:29 +0000 (13:39 +0000)
     and e1ad72ee8783ac4fe892383e7de14bdd43d8f7d5


Trivial merge