From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Jul 2005 21:48:58 +0000 (+0000)
Subject: merge of 25e31bea2d2b004a18c1cd7472201bf31309d94c
X-Git-Tag: Release-2010-05/1~9453^2~4140^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330714022514d2b913a2e5ced962598d2a02d2a4;p=openembedded.git

merge of 25e31bea2d2b004a18c1cd7472201bf31309d94c
     and 301d170c61be8d8a8e702068717e29a57ef2e4c8
---

330714022514d2b913a2e5ced962598d2a02d2a4