From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 13 Feb 2008 10:55:47 +0000 (+0000)
Subject: merge of '6828c0e5742385a5f78150f5504e1690ea6c4111'
X-Git-Tag: Release-2010-05/1~7696^2~2^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f0344845902edcbfed4d1bfc4996210f793a947;p=openembedded.git

Merge ... '6828c0e5742385a5f78150f5504e1690ea6c4111'
     and 'f26d3059129388297f1542283ce17d100f8c8acc'
---

0f0344845902edcbfed4d1bfc4996210f793a947