merge of 8aba1d7399a8286555d917d8cc039be86a2fd93b
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Wed, 26 Apr 2006 21:08:21 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 21:08:21 +0000 (21:08 +0000)
     and 9e19112a1220e2f1c7cb44d9f8f9f71c7b3cae88


Trivial merge