From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Fri, 19 Sep 2008 23:24:30 +0000 (+0000)
Subject: merge of '0f57f5bc8ead2dbd47f11f9b636930304209133f'
X-Git-Tag: Release-2010-05/1~6042^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de0bb543e8f5cd3b60a3c82e5ffe199dcc187bd9;p=openembedded.git

Merge ... '0f57f5bc8ead2dbd47f11f9b636930304209133f'
     and '3ee0a6f68b337fd507253610e831ff5b31c0bb04'
---

de0bb543e8f5cd3b60a3c82e5ffe199dcc187bd9