merge of 8b0bc8c41b0802e756c70c90ed7dc760e76bb9bf
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sun, 30 Apr 2006 12:18:39 +0000 (12:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 12:18:39 +0000 (12:18 +0000)
     and f334192f936949d2ad335312f690105e8371df03


Trivial merge