From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Mar 2008 22:35:06 +0000 (+0000)
Subject: merge of '49d6fb299ea52b27b881053a089d50fa688a1582'
X-Git-Tag: Release-2010-05/1~7572^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bceba1ecbeaad08e8d8dd5522b911f9957aad453;p=openembedded.git

Merge ... '49d6fb299ea52b27b881053a089d50fa688a1582'
     and '89bcc665b5e831cc60b3aaef92e938c69ba33870'
---

bceba1ecbeaad08e8d8dd5522b911f9957aad453