merge of 074f56407ae01edaf2a9a0ab4cf9fb1222987ef2
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Tue, 29 Nov 2005 07:45:21 +0000 (07:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 07:45:21 +0000 (07:45 +0000)
     and 2be4c1fa8dfa147e7db3747ea8371745d6a1fb9f


Trivial merge