merge of 31055e640cd3ed10f565b48ba9c4ef57da2243cb
authorFrederic Bompart <frederic@unknown.openembedded.org>
Thu, 1 Dec 2005 17:06:33 +0000 (17:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 17:06:33 +0000 (17:06 +0000)
commitb2d622b2a8d6d367f3a01366f1ae0bb5617f38f6
treec65c951effde103bca9ea7738d9cca4e5582a536
parent462885aa9e50570c7b42a222b509662a2c6bba68
parentacec80dde3ba454c4f9ba8b260334eaae89fbdfa
merge of 31055e640cd3ed10f565b48ba9c4ef57da2243cb
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e