From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 3 Aug 2007 19:12:42 +0000 (+0000)
Subject: merge of '10bc51a56352cd32ff5b7b70a1690ba41c538716'
X-Git-Tag: Release-2010-05/1~8868^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a667b8e4751d7b03aaa8e35128fcd29a0d24bf1b;p=openembedded.git

Merge ... '10bc51a56352cd32ff5b7b70a1690ba41c538716'
     and 'a0e7e86db7c5ef00350a27bbe1959df6c1375b2a'
---

a667b8e4751d7b03aaa8e35128fcd29a0d24bf1b