From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 4 Jul 2005 21:12:18 +0000 (+0000)
Subject: merge of 23bb3a5261f624ea5502a4ccac2f393b317945aa
X-Git-Tag: Release-2010-05/1~9453^2~4236
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4de844e4e36bda0d174b5abe7396302a3da7cb8;p=openembedded.git

merge of 23bb3a5261f624ea5502a4ccac2f393b317945aa
     and 6fea75a01717e9a3be9efaa5c936d47364d6f317
---

a4de844e4e36bda0d174b5abe7396302a3da7cb8