merge of cdbb7877ce270a2160669f6ed055cdd98154f548
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 15:07:31 +0000 (15:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 15:07:31 +0000 (15:07 +0000)
commit2222e629a6bf3ebaafce55cfd533486ec9926887
tree8f328bede8fe472400816615036442188e6f3ae3
parentc188d2495bc60e42002c057af5ccad7612d86385
parent187e799b91fe2f26ccce071be6f3c06ae5db8767
merge of cdbb7877ce270a2160669f6ed055cdd98154f548
     and cf54ffcd5816180e831bfbb9a1e93abeb12a62e4