From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 12 Jul 2006 13:49:19 +0000 (+0000)
Subject: merge of 5180d45d06f92e034b4c024f4f52e16d157aa0d9
X-Git-Tag: Release-2010-05/1~9453^2~1237^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb7dbea15a9defe06eff9e3d63a7ea342e71448;p=openembedded.git

merge of 5180d45d06f92e034b4c024f4f52e16d157aa0d9
     and 596b10cd24c63dccc9c168ee841040c9f8615e50
---

2fb7dbea15a9defe06eff9e3d63a7ea342e71448