From: John Lee <john_lee@openmoko.org>
Date: Thu, 13 Mar 2008 09:48:39 +0000 (+0000)
Subject: merge of '6b297f40d507a619bdd7d471e82d15807c186499'
X-Git-Tag: Release-2010-05/1~7106^2^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f41eb6f0098aefd20bd466920d25247b144b09a3;p=openembedded.git

Merge ... '6b297f40d507a619bdd7d471e82d15807c186499'
     and '9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb'
---

f41eb6f0098aefd20bd466920d25247b144b09a3