merge of 6fdb3347025c12bf6ebe065971216714232b9f38
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 27 Feb 2006 20:31:30 +0000 (20:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Feb 2006 20:31:30 +0000 (20:31 +0000)
     and bf751c693cb0aa66fdfbf2e072c7ac7e772351ce


Trivial merge