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

Merge ... '826e3d1604a7153fbec79dbf0287cbde9dd32200'
     and 'e8ef8cbc778629395b3eb845590295f8c168d5c1'
---

a0f9ca6368207cdfde66bd3f31854bdba67e93fc