merge of 371519ee16090c31f871dd775b4e4d1660ac9b5a
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 Jun 2006 19:19:18 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 19:19:18 +0000 (19:19 +0000)
commitd497e7d0b948032b5d6c00ba6ca3d8f6986e1c92
treea1d9ba5dfba0c3a4f0fd97c5cf476363ea78ecaa
parentd16d856a4f24828edd5806477c55242352b46ecc
parent526972156e164b8ab8248bf31c5472aa1c16df29
merge of 371519ee16090c31f871dd775b4e4d1660ac9b5a
     and 58064edf80749f708183ec81472dc2950f816a94