From: Mike Westerhof <mwester@dls.net>
Date: Tue, 17 Jun 2008 16:56:52 +0000 (+0000)
Subject: merge of '9831ee83165ae726c1641da5b4f8f00b78674b85'
X-Git-Tag: Release-2010-05/1~6675^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8710c0212e53c8ee9c8e89d9990a07b840ae377c;p=openembedded.git

Merge ... '9831ee83165ae726c1641da5b4f8f00b78674b85'
     and 'dc80ff7ef30fb0e742800d3342ca5811d15194dc'
---

8710c0212e53c8ee9c8e89d9990a07b840ae377c