From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 3 Sep 2008 19:22:53 +0000 (+0000)
Subject: merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
X-Git-Tag: Release-2010-05/1~6167
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdafdc4da4ca1c891d593d2839e024484b0c2468;p=openembedded.git

Merge ... '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
     and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'
---

cdafdc4da4ca1c891d593d2839e024484b0c2468