merge of 77427b7691c67cf3ecdc79daee1b82735fbde647
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 19:01:36 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 19:01:36 +0000 (19:01 +0000)
     and a0aeef73911795727aaca6acf6e75fe2ab17ae90


Trivial merge