From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 9 Apr 2008 00:17:35 +0000 (+0000)
Subject: merge of 'd506336ff98cc7331f3a17226b7b10cef8817694'
X-Git-Tag: Release-2010-05/1~7220^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=200730ec3214ba00c53ce777ec86b30df43e0d4a;p=openembedded.git

Merge ... 'd506336ff98cc7331f3a17226b7b10cef8817694'
     and 'f4ac5cba40afcaee88ee7f46e4ac7ae23cedea9d'
---

200730ec3214ba00c53ce777ec86b30df43e0d4a