merge of 198b28bba87e8c42ab6041406faa358334417c02
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 06:22:41 +0000 (06:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 06:22:41 +0000 (06:22 +0000)
commitcda660808fbc381cc11fb9ceb3cd0cde13c239d7
treefa0d752a206a0c5db0649f0160f0b54e9c3f15a2
parent23d4b048f42531eee488f8ddf510371c9eaa0e0c
parenta4f0089c5bf7d37257b244fb08de5e756498c6cd
merge of 198b28bba87e8c42ab6041406faa358334417c02
     and 3862f1af15047c5bdc27ca357df15bdd3b9d80c3