From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 10 Jun 2006 11:20:56 +0000 (+0000)
Subject: merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
X-Git-Tag: Release-2010-05/1~9453^2~1471
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2e769cf5aaf5d0cd39cfd563d694af446588a30;p=openembedded.git

merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
     and a11a9b2115534b69d4caed3521f23c8da3c2c11f
---

e2e769cf5aaf5d0cd39cfd563d694af446588a30