From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 29 Jul 2005 12:08:59 +0000 (+0000)
Subject: merge of 381601652b317baceda945983007efd557415021
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d6dfc1c87b7bf5130ca2e609e07271c4f67a95;p=openembedded.git

merge of 381601652b317baceda945983007efd557415021
     and e56174b33bfcc4e2ed05f97322cf481ccaaf624a
---

07d6dfc1c87b7bf5130ca2e609e07271c4f67a95