merge of 0dcf135f8174d6cb8b709f2104158f5de5fa769d
authorKoen Kooi <koen@openembedded.org>
Mon, 6 Feb 2006 09:02:33 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 09:02:33 +0000 (09:02 +0000)
commit23d84f45ff8f5a03695c1cd0e1dac0d1d3390b96
tree27112b3fe3bf10e0601be53fdfcc99b84130fb12
parent0d9012187fcb9d4d5efb3fa7960f984d9de102bb
parentd2449f188c1d5b589a2e26dd044d3c717e36cb42
merge of 0dcf135f8174d6cb8b709f2104158f5de5fa769d
     and 6e0b7038969c91f76744d47455957a8284414e7d