From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 Mar 2008 17:12:38 +0000 (+0000)
Subject: merge of '05ad3485b42ecb00f88755641322f85ba7842784'
X-Git-Tag: Release-2010-05/1~7571
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64197d831371bd8450d65a9349be5ab55f366f59;p=openembedded.git

Merge ... '05ad3485b42ecb00f88755641322f85ba7842784'
     and 'db7e324079b29569e9e6a52a22576a281140b12a'
---

64197d831371bd8450d65a9349be5ab55f366f59