From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 25 Aug 2008 15:47:46 +0000 (+0000)
Subject: merge of '439075141b0d6ffd64c201829b5e172db68ef97e'
X-Git-Tag: Release-2010-05/1~6247
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac8b729e1af278982c713e9317dc2f13ee50d186;p=openembedded.git

Merge ... '439075141b0d6ffd64c201829b5e172db68ef97e'
     and 'f2cd2a30cb6f115f92cd1c1e84bfb040f0a12597'
---

ac8b729e1af278982c713e9317dc2f13ee50d186