merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 19:17:24 +0000 (19:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 19:17:24 +0000 (19:17 +0000)
commit94bb836c42bb122b140d7fc0ad0a5775a064ce9a
treed0901f122f47da6abe416cedd31376740e6a1efa
parent348f2ded2310934f32774fce605625e2976a2d5e
parent95e7c0ab24272bde3c1c5d4b89f53ecd8c402125
merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
     and aaa38d713385c71e081266891f9d3775789db3a1