From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 22 Nov 2007 02:26:25 +0000 (+0000)
Subject: merge of '0c1bf31806b2e4fc83b4405655fc3b14a98915c5'
X-Git-Tag: Release-2010-05/1~8305^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d86fddc630bb02a00954c2aa8d9b3813589cfb29;p=openembedded.git

Merge ... '0c1bf31806b2e4fc83b4405655fc3b14a98915c5'
     and '4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6'
---

d86fddc630bb02a00954c2aa8d9b3813589cfb29