merge of 4350e5b1e0c9dfe943f5937f8a3a4ca10e86ad5b
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 22 Oct 2005 17:41:04 +0000 (17:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Oct 2005 17:41:04 +0000 (17:41 +0000)
     and cd62a942d3f4d8312805fdc22c6d3c92d034e14c


Trivial merge