From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sat, 22 Mar 2008 12:50:50 +0000 (+0000)
Subject: merge of '5b214d5b98fc841f5638a7aae10346be791d4f6e'
X-Git-Tag: Release-2010-05/1~7294^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a8a2faaae0dea454c1d6250ec32ca6250c0a5e;p=openembedded.git

Merge ... '5b214d5b98fc841f5638a7aae10346be791d4f6e'
     and '77ea16d350b9eb0460b41c2afb44180a4ecdc778'
---

65a8a2faaae0dea454c1d6250ec32ca6250c0a5e