From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 10 Aug 2007 08:33:56 +0000 (+0000)
Subject: merge of 'ca79cbe803b8aa5bd6d3ebe944504e5af8234d59'
X-Git-Tag: Release-2010-05/1~9062
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2936ad115a3e471324875ebc28882db58d47a4d;p=openembedded.git

Merge ... 'ca79cbe803b8aa5bd6d3ebe944504e5af8234d59'
     and 'fc9df3f6bc3d16669463fde20e46e8b5a683ad84'
---

c2936ad115a3e471324875ebc28882db58d47a4d