merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:38:00 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:38:00 +0000 (15:38 +0000)
commite475db3258cccd9f7b098be7c82813766bfc63f7
tree359414a11d84fcc726dab447f63c13f2afc3b102
parent14f1e2441bfc5365d1297c7c8aaaabee604d3cb8
parentc3a20dc277a3913df8c25ce50997d3ccccc2f448
merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
     and 7eab4425d3ef00f6bc0fc9dcf55117c3cf8c24d6