From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Oct 2006 13:31:14 +0000 (+0000)
Subject: merge of c1656691540333cfa24d768dfa15b6c02ea73ac5
X-Git-Tag: Release-2010-05/1~9453^2~567^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a1ba4d8b2dc14d53704fd3c5a5f443f524e0626;p=openembedded.git

merge of c1656691540333cfa24d768dfa15b6c02ea73ac5
     and fd56b82c42943805000e3f8fb010ecb848d951ef
---

1a1ba4d8b2dc14d53704fd3c5a5f443f524e0626