From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 13:52:24 +0000 (+0000)
Subject: merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
X-Git-Tag: Release-2010-05/1~7106^2^2~24^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddce565c6fda1303b0ef1d00b5cb3f05be126139;p=openembedded.git

Merge ... '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
     and 'a6c27719ef581b67631459a7dcb52cea53fc0ccf'
---

ddce565c6fda1303b0ef1d00b5cb3f05be126139