From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 24 Sep 2008 08:31:13 +0000 (+0000)
Subject: merge of 'c9189cf531a6d542d7960e099d5ba157da963401'
X-Git-Tag: Release-2010-05/1~5988
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17d2b8a8282c911f3d394fac1d042912c1f7f0ee;p=openembedded.git

Merge ... 'c9189cf531a6d542d7960e099d5ba157da963401'
     and 'cdf01a4ca20cb7c2ce18d070d85bd75bcb532cc7'
---

17d2b8a8282c911f3d394fac1d042912c1f7f0ee