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

merge of 2b7e98de2ae7babc1fba7bf05e9cd56e79bd2aa3
     and b8059643b9bf29e34eaa1ca3277803350bd390bc
---

2add570ff8afa0136ba9eff5b7a1b3caf870a377