From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Mar 2008 17:13:43 +0000 (+0000)
Subject: merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
X-Git-Tag: Release-2010-05/1~7550^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73390c1949090ef86084b3d817474c1c7cdeed28;p=openembedded.git

Merge ... '2b134fb4a5278b379deec7fbafe34576ac3f266c'
     and 'e86cbb0aa6849e39a142ce4c582d140b921326d1'
---

73390c1949090ef86084b3d817474c1c7cdeed28