From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 19 Aug 2006 16:02:31 +0000 (+0000)
Subject: merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
X-Git-Tag: Release-2010-05/1~9453^2~913
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74548169592daa787b2813602acfc624aa8d4828;p=openembedded.git

merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
     and 67adbb4efb9e9642f8b5476abd6692720c8cd642
---

74548169592daa787b2813602acfc624aa8d4828