From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 6 Dec 2006 10:55:45 +0000 (+0000)
Subject: merge of '3fa76fd2a4646a878f0810156dec4b7da94c14f2'
X-Git-Tag: Release-2010-05/1~9453^2~204
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17582a4ad4e22d8a4c65739913c63acb5d091aee;p=openembedded.git

Merge ... '3fa76fd2a4646a878f0810156dec4b7da94c14f2'
     and 'ee31c6e3fc63b93eae8552042728645a8206cf1c'
---

17582a4ad4e22d8a4c65739913c63acb5d091aee