merge of 085d7150845adc7b63d27d8e1468741c72a3561b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Mar 2006 18:17:16 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 18:17:16 +0000 (18:17 +0000)
commit9655b8ae14b83232a594a63ff1af1c4377de61a0
tree477dd7614e31be7276f9636cebdc51816bab9f8a
parentbd39077a411c69536f6744953830a50b9cbc5c8e
parentaae401ae4a0f9661503735b0d1d95c2345f88b00
merge of 085d7150845adc7b63d27d8e1468741c72a3561b
     and 48c734b5e2a4506518472e70e77b4699c76a92b3