From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 18 Apr 2007 17:05:38 +0000 (+0000)
Subject: merge of '5a4285ad6b3d7c5a06194b0dd1ae8e7c57cdeaaf'
X-Git-Tag: Release-2010-05/1~8868^2~687^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e755a1c503c090de21133f80753eefd8fae3591;p=openembedded.git

Merge ... '5a4285ad6b3d7c5a06194b0dd1ae8e7c57cdeaaf'
     and 'f9ad1bcbdfe9f172658de8e1aecfb3a9520bb25f'
---

5e755a1c503c090de21133f80753eefd8fae3591