From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 24 Feb 2008 17:55:01 +0000 (+0000)
Subject: merge of '297ad7b94e8bbe83dfdc4147df98885ce3617e76'
X-Git-Tag: Release-2010-05/1~7631^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ede98dffd7fe68146a2ed174dd06bfa195bc8a0;p=openembedded.git

Merge ... '297ad7b94e8bbe83dfdc4147df98885ce3617e76'
     and '6678db7afc1756949a7d7e0c29814b8ba5988e74'
---

8ede98dffd7fe68146a2ed174dd06bfa195bc8a0