From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Jan 2008 04:05:57 +0000 (+0000)
Subject: merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
X-Git-Tag: Release-2010-05/1~7106^2^2~103
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9abe95dd3d38718f0d399bcf858f35652e14400c;p=openembedded.git

Merge ... '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
     and 'a22503624f899a2e28116f2ca9acb54520778734'
---

9abe95dd3d38718f0d399bcf858f35652e14400c