From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 4 Aug 2006 13:59:42 +0000 (+0000)
Subject: merge of 0c794d3c26ebf237e0cb48477ca29509caf0987c
X-Git-Tag: Release-2010-05/1~9453^2~999^2~9^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfdb8d4196eb11aabbdd98c25ce79e3effc8f405;p=openembedded.git

merge of 0c794d3c26ebf237e0cb48477ca29509caf0987c
     and 1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce
---

cfdb8d4196eb11aabbdd98c25ce79e3effc8f405