From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 1 Aug 2008 18:48:27 +0000 (+0000)
Subject: merge of '03e37205ddb308324f3e7b1e882c50510b125716'
X-Git-Tag: Release-2010-05/1~6406^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81109d7d1da88e2ceab774868eedfb6d884a8b18;p=openembedded.git

Merge ... '03e37205ddb308324f3e7b1e882c50510b125716'
     and '9ed8a9e4b331c4c26542be80abb9775edaf8f5bf'
---

81109d7d1da88e2ceab774868eedfb6d884a8b18