merge of 1031d19d0f1be5bb1839e46b6f7dd3cc1bc86668
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 10 Jul 2005 05:44:03 +0000 (05:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Jul 2005 05:44:03 +0000 (05:44 +0000)
     and 90985ad6d341c9f6bdacb4243ddf551bffb6c2d6


Trivial merge