merge of 472137c91cd2763cfea42083bda4e61baa8fadac
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 12 Jun 2006 16:43:22 +0000 (16:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 16:43:22 +0000 (16:43 +0000)
     and ea7b1dd351debede509c701575f64be3804a0c93


Trivial merge