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)
     and ae1272cefbd4147e462e255072a2484f4f9a7a1b


Trivial merge