From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 4 Jul 2005 10:49:22 +0000 (+0000)
Subject: merge of 8b7c8c60a9c08d2032c5f9659b2bbdc8bb4ba7d0
X-Git-Tag: Release-2010-05/1~9453^2~4242
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28897964a2c166dcfa4b153e42d65a40222cf3c8;p=openembedded.git

merge of 8b7c8c60a9c08d2032c5f9659b2bbdc8bb4ba7d0
     and e60c3e0f78936a1187fd5f10ad0ece02bd25d3bc
---

28897964a2c166dcfa4b153e42d65a40222cf3c8