merge of 80a8130b3da0a98fbccd7bef8f3b8647239e6bc2
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 19 Jul 2005 23:03:42 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 23:03:42 +0000 (23:03 +0000)
     and 9ce79f682762916b0f219b8a3517a242d0c38eb1


Trivial merge