From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 28 Mar 2007 08:29:51 +0000 (+0000)
Subject: merge of '5167dafe589b30b1fd121e9d64ec6695c4be37ab'
X-Git-Tag: Release-2010-05/1~8868^2~970
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e10cadf291faacfb58994f5cba16a5993fa8e98;p=openembedded.git

Merge ... '5167dafe589b30b1fd121e9d64ec6695c4be37ab'
     and '70ffcc90192c83c34dd8fd3a380a9fbef4337058'
---

2e10cadf291faacfb58994f5cba16a5993fa8e98