From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sat, 15 Mar 2008 23:37:45 +0000 (+0000)
Subject: merge of 'b9c4f1cc88011971bc5cab1439118b7e70f83ed9'
X-Git-Tag: Release-2010-05/1~7441
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c063e6a71ea62b82453e062fbd005318317c1736;p=openembedded.git

Merge ... 'b9c4f1cc88011971bc5cab1439118b7e70f83ed9'
     and 'c841840b6b60071668006ee810bf8da6f4154973'
---

c063e6a71ea62b82453e062fbd005318317c1736