merge of 6a15a634097b93cdeacbb88ce9518ce0bf5a945f
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 9 Sep 2005 03:15:48 +0000 (03:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Sep 2005 03:15:48 +0000 (03:15 +0000)
     and e55a199a204af711c51f5c00ac2612d54f98edc2


Trivial merge