From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 3 Jul 2005 16:07:18 +0000 (+0000)
Subject: merge of 09a8da47b54f1328431c3acf759622b48a210fb1
X-Git-Tag: Release-2010-05/1~9453^2~4251
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42d1e34d7637df66c065269d5f00766e44c0c014;p=openembedded.git

merge of 09a8da47b54f1328431c3acf759622b48a210fb1
     and 9495acb7fa79535be3dc1aec9165fc8dfa1b0ccf
---

42d1e34d7637df66c065269d5f00766e44c0c014