From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 24 Aug 2005 11:25:00 +0000 (+0000)
Subject: merge of 771edb7edd8b560569a56b0e95f25a9a5685a599
X-Git-Tag: Release-2010-05/1~9453^2~3829
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25db167ac64f1bfa2cb7e1a4de0cd5d3aa07ce4c;p=openembedded.git

merge of 771edb7edd8b560569a56b0e95f25a9a5685a599
     and b7f12e469db67fa2a88f0754895db961c1222134
---

25db167ac64f1bfa2cb7e1a4de0cd5d3aa07ce4c