merge of 749a74b807f23c00b9560c4ea5e45c3bdd945ae9
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 28 Oct 2005 05:18:58 +0000 (05:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Oct 2005 05:18:58 +0000 (05:18 +0000)
     and d5f672b215553b0622c8ee9a8ee627e900ab92e4


Trivial merge