merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 08:30:48 +0000 (08:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 08:30:48 +0000 (08:30 +0000)
commitd2449f188c1d5b589a2e26dd044d3c717e36cb42
treeaeadae4152b1b4177e35ff7df0f6c03797629082
parentdf9021a741b54e4504ba2e639b582b808994a2b4
parent4228b12fbf49084eeaabec66c4785a0a091015f6
merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
     and ae1272cefbd4147e462e255072a2484f4f9a7a1b