From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 1 Aug 2008 01:34:51 +0000 (+0000)
Subject: merge of 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
X-Git-Tag: Release-2010-05/1~6413
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d86dadb72d00af99206f5a4f9dd90236eefecd53;p=openembedded.git

Merge ... 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
     and 'ef63b228877ae1c3c905d3921b256693b1914dea'
---

d86dadb72d00af99206f5a4f9dd90236eefecd53