From: John Lee <john_lee@openmoko.org>
Date: Tue, 15 Jan 2008 15:28:44 +0000 (+0000)
Subject: merge of '8996304d45d20965f75c306e6317a0238f26fbf7'
X-Git-Tag: Release-2010-05/1~7106^2^2~103^2~1^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58e5c1fe677e34b28943452f3acf93be83e737ce;p=openembedded.git

Merge ... '8996304d45d20965f75c306e6317a0238f26fbf7'
     and 'd0954a8a227efc014d29aba8d911adfc59934357'
---

58e5c1fe677e34b28943452f3acf93be83e737ce