From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 12 Jul 2006 00:36:58 +0000 (+0000)
Subject: merge of 94291eae06928b22e09d03d183930448448dbfc1
X-Git-Tag: Release-2010-05/1~9453^2~1237^2~2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fa483c395def75f3be2ca444cc0c1836f32b7a9;p=openembedded.git

merge of 94291eae06928b22e09d03d183930448448dbfc1
     and c5b3cb5a9771aadc23fcc3fb7f9c4dcd0feca7ad
---

2fa483c395def75f3be2ca444cc0c1836f32b7a9