From: John Lee <john_lee@openmoko.org>
Date: Tue, 22 Jan 2008 04:26:10 +0000 (+0000)
Subject: merge of '214ed7e892086095fb4e656e5d3777e201866e46'
X-Git-Tag: Release-2010-05/1~7844^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34bc75be8e4f52841094c140aac1de9ca88d15fe;p=openembedded.git

Merge ... '214ed7e892086095fb4e656e5d3777e201866e46'
     and '824c66fc36263bf7387bf3cac74b83506fa27024'
---

34bc75be8e4f52841094c140aac1de9ca88d15fe