From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Mar 2008 15:27:06 +0000 (+0000)
Subject: merge of '425c65549a13b612465a7a2f4e273d993f692a31'
X-Git-Tag: Release-2010-05/1~7588^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9757d602dd4c36a39a236b79c594aa07583ce376;p=openembedded.git

Merge ... '425c65549a13b612465a7a2f4e273d993f692a31'
     and '5c59665d0dd415bc5372cdf976b15c13956e6f36'
---

9757d602dd4c36a39a236b79c594aa07583ce376