From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 22 Jul 2008 22:09:41 +0000 (+0000)
Subject: merge of 'aadc54707d1990050b64f5354702d6454308b093'
X-Git-Tag: Release-2010-05/1~6483
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48905930ee9f06a52744003a89e994ee06c19d4;p=openembedded.git

Merge ... 'aadc54707d1990050b64f5354702d6454308b093'
     and 'd2cf665b4d3013caa5979709d44b24fb0f2a9812'
---

c48905930ee9f06a52744003a89e994ee06c19d4