merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50
authorMatthias Hentges <oe@hentges.net>
Wed, 17 May 2006 08:10:04 +0000 (08:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 08:10:04 +0000 (08:10 +0000)
commit5eadf46fddcf289beef3ea320677d969eb4a63fa
tree9b789c9dab8d02d32d136dc6f1b2f737fd581070
parent01a4a1d8ecd20547b0d291afcb2c0c6ff1b05a51
parent2328ac8bc6a44b9a0e57ad503a57fabb80facac1
merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50
     and 5ae0815fd4186ce653535a78ab0e482e9a7c24f4