From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 8 Oct 2007 17:07:10 +0000 (+0000)
Subject: merge of '397294e12f174d25745f5b3b591468ffd54fec4d'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~109
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8509e92c44e3df14f799c38a0501f4127ab6e503;p=openembedded.git

Merge ... '397294e12f174d25745f5b3b591468ffd54fec4d'
     and 'e8e5e906fda8d6117edc8f3082056c7d690921a7'
---

8509e92c44e3df14f799c38a0501f4127ab6e503