From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 13 Jan 2006 11:56:12 +0000 (+0000)
Subject: merge of 4aeadc5b624f802be51ae097db69e1b49194e1df
X-Git-Tag: Release-2010-05/1~9453^2~2672
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ee3b810b516e71c819c46c9db0ea3deedb3aca;p=openembedded.git

merge of 4aeadc5b624f802be51ae097db69e1b49194e1df
     and 8fb9f22bce3a16f84e10839a92c8b55f7329a5c7
---

a6ee3b810b516e71c819c46c9db0ea3deedb3aca