merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
authorMichael Lauer <mickey@vanille-media.de>
Mon, 6 Feb 2006 18:41:09 +0000 (18:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 18:41:09 +0000 (18:41 +0000)
commit27651b95cc9880d646b60e62686bbd1b000556ba
treedf9156dcdda54861d251b03192d3a13fc7e3bfa1
parent4476d4b3760464127d42bf6288405d0f4d5bb1a8
parent5c70d86825ced73fe07d02a4647e70c54f2efe07
merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
     and 939b3d278f2da67c4ed00b67eabd89eb6d0c0f59