From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 22:20:00 +0000 (+0000)
Subject: merge of 12c8ec6ea03d7bf942717daba4cc06fd518965c0
X-Git-Tag: Release-2010-05/1~9453^2~1686
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac0214c0b84b53bc043ef643ff7857d3cce8d54e;p=openembedded.git

merge of 12c8ec6ea03d7bf942717daba4cc06fd518965c0
     and f46af8d8602581214b59314f71fbd9fcdfda0fef
---

ac0214c0b84b53bc043ef643ff7857d3cce8d54e