From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 12 Jan 2008 00:40:21 +0000 (+0000)
Subject: merge of '3a9c0f4a00528662d37b097973dd3b51287562c4'
X-Git-Tag: Release-2010-05/1~7912^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53437a0c949737295bc9a1799c51f70cd5e21e95;p=openembedded.git

Merge ... '3a9c0f4a00528662d37b097973dd3b51287562c4'
     and '841845db4cfff04ccff4ec075f181561fb3ad63f'
---

53437a0c949737295bc9a1799c51f70cd5e21e95