merge of 2f9bcc5fda851203cdc666cc9697f96c4acb2cf7
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 15:16:05 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 15:16:05 +0000 (15:16 +0000)
     and e60f9bf4e3714006cd19bf86bc76e3009a7bfff3


Trivial merge