merge of 1ab8e3772bfbaecdabe093d92f28f8c2148e4f61
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Aug 2005 21:02:16 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 21:02:16 +0000 (21:02 +0000)
commitb30f2ba35f2f5e19fa8000315cb4a8e29d623303
treea7025d995b6ed2bddc70878f24113482c0daaeae
parentc4509f9fd2e001ca59e69720456060d8b72147a0
parent21b3ee7d3b37f056e14e7619635c601f15935d83
merge of 1ab8e3772bfbaecdabe093d92f28f8c2148e4f61
     and 231e6c9de778cfd05359c4ae1ef7485ffbacb78b