From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Fri, 19 Sep 2008 02:34:43 +0000 (+0000)
Subject: merge of '028626165f94e6e0adee3c762f85ef505eeaa914'
X-Git-Tag: Release-2010-05/1~6043^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f24acef873cb1ab43b40fe7b2c5d6e065dd6dc5;p=openembedded.git

Merge ... '028626165f94e6e0adee3c762f85ef505eeaa914'
     and '57913c45a2b8c01ec5a3c8f98a39b2fa258c0ffd'
---

3f24acef873cb1ab43b40fe7b2c5d6e065dd6dc5