From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 13 Apr 2008 10:34:06 +0000 (+0000)
Subject: merge of '3cbc7c235df8720637ca4f1cfe3886d015edcd18'
X-Git-Tag: Release-2010-05/1~7206
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408ac901f3fbc62684c7d9d2cd2e15b5688e6194;p=openembedded.git

Merge ... '3cbc7c235df8720637ca4f1cfe3886d015edcd18'
     and '414c46b290373923c8fbd2f140667276dc33aa54'
---

408ac901f3fbc62684c7d9d2cd2e15b5688e6194