From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 28 Jun 2006 19:34:17 +0000 (+0000)
Subject: merge of f53e73238f903a9d33e92490cbd1cb8822fcf5f0
X-Git-Tag: Release-2010-05/1~9453^2~1409^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c4acbeeedda4db03576b46f5b1ef3ff44e10d9;p=openembedded.git

merge of f53e73238f903a9d33e92490cbd1cb8822fcf5f0
     and b6fd5d15175f87facba5c703b206a7c235ecaed5
---

68c4acbeeedda4db03576b46f5b1ef3ff44e10d9