From: Cliff Brake <cbrake@bec-systems.com>
Date: Fri, 7 Jul 2006 21:34:03 +0000 (+0000)
Subject: merge of 0f2321c6e0db99fe52fff7034bda2e94071cce3f
X-Git-Tag: Release-2010-05/1~9453^2~1296^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a95cf78151d38667937290c0fb6ec389c21b41;p=openembedded.git

merge of 0f2321c6e0db99fe52fff7034bda2e94071cce3f
     and 9e05b81f49d14d12bfd5c8330a141277c1a3151c
---

58a95cf78151d38667937290c0fb6ec389c21b41