From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 19 Mar 2008 04:27:49 +0000 (+0000)
Subject: merge of '173acf0910a1de8997f933a70422e802d5cea267'
X-Git-Tag: Release-2010-05/1~7374^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebc0c581d446761ece1729a4b9b2c66359eb20dc;p=openembedded.git

Merge ... '173acf0910a1de8997f933a70422e802d5cea267'
     and '26409b38a6c1f3c87a0e717bac4510cd2c57d12e'
---

ebc0c581d446761ece1729a4b9b2c66359eb20dc