From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 18:45:28 +0000 (+0000)
Subject: merge of '42aef61ee7960f3e8df22a2a931c9a46a49531ab'
X-Git-Tag: Release-2010-05/1~7106^2^2~103^2~1^2~4^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b179e93742d55e9c9855a807b4e95c68f3467300;p=openembedded.git

Merge ... '42aef61ee7960f3e8df22a2a931c9a46a49531ab'
     and '8c1bc2522cabf9236face70bb7d76a41876d04d6'
---

b179e93742d55e9c9855a807b4e95c68f3467300