From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 15 May 2006 14:51:32 +0000 (+0000)
Subject: merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
X-Git-Tag: Release-2010-05/1~9453^2~1696^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb8c3044a3122a2af92f1749fbccddd9254bfce;p=openembedded.git

merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
     and a3de2e3141246a68170d4fe5e4a7390e7ebe041e
---

0bb8c3044a3122a2af92f1749fbccddd9254bfce