merge of 4e126c4523e768ce808bbed9a1c49d7855904efb
authorCliff Brake <cbrake@bec-systems.com>
Wed, 31 Aug 2005 14:19:51 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 14:19:51 +0000 (14:19 +0000)
     and 9178fa6f2933e92a1fb27a64d0e1fa7b48fc6ba2


Trivial merge