From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 21 May 2006 19:20:44 +0000 (+0000)
Subject: merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
X-Git-Tag: Release-2010-05/1~9453^2~1654^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b58691d3939afaeb888705a142023befcced6e8;p=openembedded.git

merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
     and dbb8f5536fbc6e50532ff14d6db8e58ae21b0398
---

7b58691d3939afaeb888705a142023befcced6e8