merge of 883e320e9096e9d226b4afb571bc0438af7de629
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 3 Feb 2006 18:59:05 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Feb 2006 18:59:05 +0000 (18:59 +0000)
commit7c02bc02736aad32e38b413bc8e7de9dc69bdaa1
treef12f994475d6ccda931652a69c65a478f561c1dd
parent95b483e401675107dffb2bb86d3650218d21aa23
parent1039577c9d25cdbcd3bb3f4d4cefc7e6b0c1985b
merge of 883e320e9096e9d226b4afb571bc0438af7de629
     and a5d19c10f69d3e208c0ae13271dd3e70b219f1aa