From: John Lee <john_lee@openmoko.org>
Date: Thu, 31 Jan 2008 11:02:11 +0000 (+0000)
Subject: merge of 'af017fe79f8b912b23d5f41862d46c33df4db680'
X-Git-Tag: Release-2010-05/1~7106^2^2~81
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cefeaceb1947c7a1090470faabe297e5012b2ca;p=openembedded.git

Merge ... 'af017fe79f8b912b23d5f41862d46c33df4db680'
     and 'e9e6d183687e379f9b185c9d71bbf26f07d9d471'
---

6cefeaceb1947c7a1090470faabe297e5012b2ca