From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 6 Jul 2007 12:14:34 +0000 (+0000)
Subject: merge of '7e6adf2eba691057299d67aeff9562e39132c566'
X-Git-Tag: Release-2010-05/1~8868^2~201
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf271f2bb42d5477b3cc0d8d0f93be45bb989ba8;p=openembedded.git

Merge ... '7e6adf2eba691057299d67aeff9562e39132c566'
     and '87a802e7da1ecadc7269191d43d5c0434062ef8d'
---

bf271f2bb42d5477b3cc0d8d0f93be45bb989ba8