merge of 56c4ad3f8bd89081f85f57b468371c5550c5ac02
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 1 Nov 2005 15:26:40 +0000 (15:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Nov 2005 15:26:40 +0000 (15:26 +0000)
     and ea663319603d7cd9a809a14f32a31e0f4dfc5f0c


Trivial merge