From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 23 Apr 2007 16:46:28 +0000 (+0000)
Subject: merge of '6c10e4e698bad3b70189cebcd53c4381ae45b884'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~57^2~5^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9df5ade468b65513a1322184c6ba43e94181d0e;p=openembedded.git

Merge ... '6c10e4e698bad3b70189cebcd53c4381ae45b884'
     and '909c507b800748c820ddc73a2c5bed204cbdbd65'
---

a9df5ade468b65513a1322184c6ba43e94181d0e