From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 6 Sep 2006 20:29:36 +0000 (+0000)
Subject: merge of '2af79ceb1e37ba57b38b201f8034eb9d90da8f12'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dde589d6413662585908540a0078aee0e6dfb15;p=openembedded.git

Merge ... '2af79ceb1e37ba57b38b201f8034eb9d90da8f12'
     and '337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f'
---

7dde589d6413662585908540a0078aee0e6dfb15