From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 22 Aug 2005 17:45:33 +0000 (+0000)
Subject: merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
X-Git-Tag: Release-2010-05/1~9453^2~3851
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042446d0ca6e821e727db9fe27a9008a5a1fabf6;p=openembedded.git

merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
     and c8b23fec424bb3ca1ac0a1bd18733a393d83a900
---

042446d0ca6e821e727db9fe27a9008a5a1fabf6