From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Jul 2006 12:04:36 +0000 (+0000)
Subject: merge of 7bd820c4a7bbdcb47264fd60a48b7099177d4859
X-Git-Tag: Release-2010-05/1~9453^2~1246
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e09a46a5d8a9f4cc55ff3b7776f59158ccd87bf;p=openembedded.git

merge of 7bd820c4a7bbdcb47264fd60a48b7099177d4859
     and 87830c48ea8ea7120ce229524f7ab20d869b1e31
---

2e09a46a5d8a9f4cc55ff3b7776f59158ccd87bf