merge of 190ba6d987a58bb9185b18f91b075113f31cbae0
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 16 Jan 2006 01:38:20 +0000 (01:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 01:38:20 +0000 (01:38 +0000)
commit9ce5a95818e5574d3fb411614519a219b9aa5c69
treedd0c7953e468e3b497538cdb4ac9d356c40843a1
parentd1596684b1b1ee85d2d746a0182da8b8df0d8e47
parent18c9101466353560610d720e168bc7488613a91b
merge of 190ba6d987a58bb9185b18f91b075113f31cbae0
     and e28d190b53d034845e4ae2fce2648104676a571b