From: Robert Schuster <thebohemian@gmx.net>
Date: Tue, 7 Oct 2008 21:37:58 +0000 (+0000)
Subject: merge of '9706988717e3c2c70303850cb12a58843a12fa20'
X-Git-Tag: Release-2010-05/1~5862^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9aa48e8ac4c98bb5704445ccd6d3a8ed95984b5;p=openembedded.git

Merge ... '9706988717e3c2c70303850cb12a58843a12fa20'
     and 'd6e042ee5309203ac2054f2cbb7ead6cb61a4e38'
---

d9aa48e8ac4c98bb5704445ccd6d3a8ed95984b5