merge of 6b05039266ce065dabeef6f1aac0190692348b17
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 29 Oct 2005 09:55:05 +0000 (09:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 29 Oct 2005 09:55:05 +0000 (09:55 +0000)
     and 9117a5cd2698e544e72b78d2b150f2eb221b4993


Trivial merge