From: Philip Balister <philip@balister.org>
Date: Thu, 24 Apr 2008 22:09:35 +0000 (+0000)
Subject: merge of '32c42c21fa615c7adc822a7cec5695a1227395a0'
X-Git-Tag: Release-2010-05/1~7109^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=244f82fe3725ccdd9b98951071de1948ab883ede;p=openembedded.git

Merge ... '32c42c21fa615c7adc822a7cec5695a1227395a0'
     and '63cd812e090dff06f4ed8dc754493c2b1862c8a0'
---

244f82fe3725ccdd9b98951071de1948ab883ede