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

Merge ... '4d03f56302a38e79c12327695f01f27a836720ec'
     and '6e585903810d19bd09a43d9293b04df368f0c308'
---

d621f09a23b6d0836aae21e19ce3f6073cd16ce4