From: John Lee <john_lee@openmoko.org>
Date: Wed, 19 Dec 2007 15:34:31 +0000 (+0000)
Subject: merge of 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
X-Git-Tag: Release-2010-05/1~7106^2^2~103^2~1^2~4^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070fcac7b8a72094d5a7efe7c7b514b96b20c2ba;p=openembedded.git

Merge ... 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
     and 'fd740dda5c7156ecf8aa35ddf9fb0f17b0e4254e'
---

070fcac7b8a72094d5a7efe7c7b514b96b20c2ba