From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 21 Nov 2007 18:27:33 +0000 (+0000)
Subject: merge of '6114e88c0acc202895c41c560c0546244d2c5227'
X-Git-Tag: Release-2010-05/1~8305^2~2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c29af7eb9dcd7cfa4e9769a94cb8153e5e432f4d;p=openembedded.git

Merge ... '6114e88c0acc202895c41c560c0546244d2c5227'
     and '90ff90e827783136b60ae8c162bf1deef26db750'
---

c29af7eb9dcd7cfa4e9769a94cb8153e5e432f4d