From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Jun 2008 13:18:15 +0000 (+0000)
Subject: merge of '8c1998b111c4a146ffd919f37f11ce915dbfb6a2'
X-Git-Tag: Release-2010-05/1~6648
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca732b87c55135550201ed111c576f49e77c4c9;p=openembedded.git

Merge ... '8c1998b111c4a146ffd919f37f11ce915dbfb6a2'
     and 'cfd22580a0b87e00837798107baafb4dc9f27b68'
---

6ca732b87c55135550201ed111c576f49e77c4c9