merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416
authorMichael Lauer <mickey@vanille-media.de>
Sat, 22 Apr 2006 21:11:33 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Apr 2006 21:11:33 +0000 (21:11 +0000)
commit323c296bf4b2260fc9d17000b9756f54a6c51e16
treec1cd8a51459aaa5b48737d7c5b71d8f91826a11f
parent4fa55e3d0c12a15daa2466b7f660ca197db5b07c
parentf5a3a0dfc80fa7d97ea2a7f948ad92f0926a524b
merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416
     and 3d32d5cfdac5307f5ee1b8a7f9cf0f1c79278f03