merge of 3b6e717ac4b3d4463cc77877b9a9a94b8d50b9e9
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 18:30:50 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 18:30:50 +0000 (18:30 +0000)
     and bf33034c282dd64819d4e41c15ee67d96dd56337


Trivial merge