merge of 1b40358f6780e83c543c70e31d60b6ac676544e8
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 27 Feb 2006 20:45:37 +0000 (20:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Feb 2006 20:45:37 +0000 (20:45 +0000)
     and afeccda0a029718396b7650c73d2eba191335fa5


Trivial merge