merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 Aug 2005 18:04:22 +0000 (18:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 18:04:22 +0000 (18:04 +0000)
commit5ffa72b197532abce18be4b46e994a1a70bb37fe
treec1744fb6153a8ce6deb30b52740c03d36533fb03
parentda2d1d094813cd5fd15bca26c1ede82db4d0e0ce
parent57efa75ce8ded5f8f617ef6896b08ee648c7852f
merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c
     and cfbd36ce13c068634dfe838d6e4d7e1980011a9b