merge of ab0d2fe564011d47e659f0272adc979bf2b14851
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 5 Jul 2006 01:57:53 +0000 (01:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 01:57:53 +0000 (01:57 +0000)
     and b4cecac313920e874d5627f1f3621c1fede4bf12


Trivial merge