From: Robert Schuster <thebohemian@gmx.net>
Date: Mon, 6 Oct 2008 14:07:16 +0000 (+0000)
Subject: merge of '15600ad0d3a82ce2f192b1a9b6e4dde4c8feb9bd'
X-Git-Tag: Release-2010-05/1~5850^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2edf230ed11e823ca4ecad9c7ae837cabba8fef2;p=openembedded.git

Merge ... '15600ad0d3a82ce2f192b1a9b6e4dde4c8feb9bd'
     and '4de558cb0dc7b78f343b4ed887c11a0758157eb6'
---

2edf230ed11e823ca4ecad9c7ae837cabba8fef2