From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 28 Sep 2008 18:44:40 +0000 (+0000)
Subject: merge of '0a9f13e573f898d652f74fb5614964dd53e3ff46'
X-Git-Tag: Release-2010-05/1~5910
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17798617669f23548a46c4263b41a47b8eae2faa;p=openembedded.git

Merge ... '0a9f13e573f898d652f74fb5614964dd53e3ff46'
     and '84184cc683b97b9e1637721ea024604a13d90609'
---

17798617669f23548a46c4263b41a47b8eae2faa