From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 6 Sep 2005 20:55:04 +0000 (+0000)
Subject: merge of 4a6e34a69c58c1380bde32bf2842f910ac57223a
X-Git-Tag: Release-2010-05/1~9453^2~3625^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c961b7022a44b1f0d0780b51562ed68005a86eb;p=openembedded.git

merge of 4a6e34a69c58c1380bde32bf2842f910ac57223a
     and fc9ac3eb2cf63e53ad156ce38ca9a3179c1b347e
---

8c961b7022a44b1f0d0780b51562ed68005a86eb