From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 16 Jan 2008 14:08:49 +0000 (+0000)
Subject: merge of '9d6e060052df45c5be50896005c5b965f0d64900'
X-Git-Tag: Release-2010-05/1~7894
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2545abb038db58e661f28328cff70d901d4be59;p=openembedded.git

Merge ... '9d6e060052df45c5be50896005c5b965f0d64900'
     and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'
---

a2545abb038db58e661f28328cff70d901d4be59