merge of 401e5a3d3886286d5d38029666c6ac415b7be733
authorKoen Kooi <koen@openembedded.org>
Mon, 26 Jun 2006 17:29:25 +0000 (17:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 17:29:25 +0000 (17:29 +0000)
commitf4b57f6055548781d4a8eb5bfbc2dec9830e7b1f
tree102ebe6aa8d1f6bd4bcec7560486a9d2d39dd560
parenta09b2107b88de568ad9674cb8e7c34b3ecca3207
parent223e09827f3e895bbe9ebae5084c19533a0869f8
merge of 401e5a3d3886286d5d38029666c6ac415b7be733
     and 579cd260bbdc718a32d629b94fbece89881341a8