merge of 8e63001b71c44d7180fad5cb696c1f236ca499bf
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 2 Jul 2005 01:57:20 +0000 (01:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jul 2005 01:57:20 +0000 (01:57 +0000)
     and e09ea609ebc72b9df978eaedae828cd360c843f9


Trivial merge