From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 09:19:46 +0000 (+0000)
Subject: merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
X-Git-Tag: Release-2010-05/1~7890^2~7^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af390ca56f3037254bcddeb8c05a6f1a9751822;p=openembedded.git

Merge ... '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
     and '65fbfb9dd8770a45ce93446888e70c955e6b11d1'
---

4af390ca56f3037254bcddeb8c05a6f1a9751822