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)
commit58a95cf78151d38667937290c0fb6ec389c21b41
treea681a1b48cbbad41bc8860efe6af07c480b541b7
parent95e959460269cda7b988b81f7bdc86e4eb71a6e5
parentf2987b7c77c6d90775e4fd91db563fa7809c9c1b
merge of 0f2321c6e0db99fe52fff7034bda2e94071cce3f
     and 9e05b81f49d14d12bfd5c8330a141277c1a3151c