From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jan 2008 23:03:32 +0000 (+0000)
Subject: merge of '9d982d512a4fe1be6d4da15efa2564ac9b14bb0d'
X-Git-Tag: Release-2010-05/1~7890^2~7^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4039f0c65f6b69427d32fff4b2eed3eb90e3baec;p=openembedded.git

Merge ... '9d982d512a4fe1be6d4da15efa2564ac9b14bb0d'
     and 'b5107429ca97b2f516633a57175b0dc5846df507'
---

4039f0c65f6b69427d32fff4b2eed3eb90e3baec