From: John Lee <john_lee@openmoko.org>
Date: Wed, 19 Mar 2008 12:15:58 +0000 (+0000)
Subject: merge of '0d06ef20f42dbc757e10ca1639e06561c357d92d'
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc3e2e2f0a564061d0d13a01d42e1d18940056f;p=openembedded.git

Merge ... '0d06ef20f42dbc757e10ca1639e06561c357d92d'
     and '3497897aabefa260ab1125e79f685e5829fbf106'
---

adc3e2e2f0a564061d0d13a01d42e1d18940056f