merge of 0f2321c6e0db99fe52fff7034bda2e94071cce3f
authorCliff Brake <cbrake@bec-systems.com>
Fri, 7 Jul 2006 21:34:03 +0000 (21:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 21:34:03 +0000 (21:34 +0000)
     and 9e05b81f49d14d12bfd5c8330a141277c1a3151c


Trivial merge