From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 15 Jan 2008 15:45:23 +0000 (+0000)
Subject: merge of '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
X-Git-Tag: Release-2010-05/1~7900
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96bfc4d951c2740e12630acbb52bb9d05acba695;p=openembedded.git

Merge ... '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
     and '8996304d45d20965f75c306e6317a0238f26fbf7'
---

96bfc4d951c2740e12630acbb52bb9d05acba695