From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 29 Jul 2005 21:42:42 +0000 (+0000)
Subject: merge of a566830db3638f59faeeac4e7bc31d7f93677248
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~22^2^2~1^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=581e1f906d20e2e439de0e9511491b214f06fcd9;p=openembedded.git

merge of a566830db3638f59faeeac4e7bc31d7f93677248
     and e584e064191863d0e0d9055263ef2e6d2abdac58
---

581e1f906d20e2e439de0e9511491b214f06fcd9