merge of 0cf2c32074f58ddc96dacfcb6af604f6a34e0c0d
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 22 Oct 2005 18:39:19 +0000 (18:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Oct 2005 18:39:19 +0000 (18:39 +0000)
     and 56b3ed4e9341f55c95f894d1e48ffe56412f45fa


Trivial merge