merge of cf839618d6d1e2c970c9b85fa8849fcbeaafb8d4
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 01:32:08 +0000 (01:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 01:32:08 +0000 (01:32 +0000)
     and fe9207286fe795f141cfced1550795b360e1e971


Trivial merge