merge of 0de420be8d89c746c304a8ee1bd19126090ff3df
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 20 Feb 2006 20:38:04 +0000 (20:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 20:38:04 +0000 (20:38 +0000)
     and 20f293e2441b5fc0517f4f72f1ef060bd48922c2


Trivial merge