From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 3 Jun 2008 15:10:49 +0000 (+0000)
Subject: merge of '430ec52386873d79595770650004fe72a7a0f620'
X-Git-Tag: Release-2010-05/1~6840
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00094a0bc8cdc287382dcb3a4cb4820fdaca9ff4;p=openembedded.git

Merge ... '430ec52386873d79595770650004fe72a7a0f620'
     and 'e112dc95accddc8f0f59b39818227d3e46468e57'
---

00094a0bc8cdc287382dcb3a4cb4820fdaca9ff4