From: John Lee <john_lee@openmoko.org>
Date: Fri, 7 Mar 2008 12:53:35 +0000 (+0000)
Subject: merge of '9069b40ccba3d40edd8269797ab9b49024e8bdc8'
X-Git-Tag: Release-2010-05/1~7106^2^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06fb90eb31b0b85a5c5c7adf185ce2515c5b1220;p=openembedded.git

Merge ... '9069b40ccba3d40edd8269797ab9b49024e8bdc8'
     and '982885ad3ab91bcc7c7f4e1ee624f2202fecf617'
---

06fb90eb31b0b85a5c5c7adf185ce2515c5b1220