merge of 2a0956d3d788fd6caf098eb56a5f161a02ad649a
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 9 Jun 2006 08:24:23 +0000 (08:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 08:24:23 +0000 (08:24 +0000)
     and e8030c72619f16a558a9178a85e85af348b8129b


Trivial merge