merge of 729ea50cb25de52bb1584824196cf92dc2c1cc50
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 15:01:53 +0000 (15:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 15:01:53 +0000 (15:01 +0000)
     and 8032192230077b09d16100e880211ea479093f78


Trivial merge