From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 9 Jun 2006 14:59:22 +0000 (+0000)
Subject: merge of 9fc1b3192dc4460c4d2e5e2d6f59a93d53fa35f2
X-Git-Tag: Release-2010-05/1~9453^2~1475
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec882dde15b1b95270d4297fdfabf66cd1bd7e6;p=openembedded.git

merge of 9fc1b3192dc4460c4d2e5e2d6f59a93d53fa35f2
     and c548c6456e349f38c0e231a616cca1f80081fcfe
---

cec882dde15b1b95270d4297fdfabf66cd1bd7e6