From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 3 Aug 2007 13:48:01 +0000 (+0000)
Subject: merge of '056153b8d72df761dd453a0744b47f49b1526274'
X-Git-Tag: Release-2010-05/1~8868^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c6c06e8536256c8d54e388da40c414bcd00586;p=openembedded.git

Merge ... '056153b8d72df761dd453a0744b47f49b1526274'
     and '84faa8309d20a2d72895ea64790f085a69d15fab'
---

27c6c06e8536256c8d54e388da40c414bcd00586