From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 27 Jan 2006 13:42:42 +0000 (+0000)
Subject: merge of 0deaec7d8f25d48f053907f69869ff62a2482979
X-Git-Tag: Release-2010-05/1~9453^2~2536
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=681bd01e17b57ecb5c13cafb7fece025fb58e412;p=openembedded.git

merge of 0deaec7d8f25d48f053907f69869ff62a2482979
     and fa6466b9a9efc26225aa474f2d3f2e558f3e993f
---

681bd01e17b57ecb5c13cafb7fece025fb58e412