From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 5 Jan 2008 19:25:48 +0000 (+0000)
Subject: merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
X-Git-Tag: Release-2010-05/1~8015
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c88ed78a67665a962a5b9a5e977cbed8b333c22;p=openembedded.git

Merge ... '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
     and '897413a90458757cb227c0afbc74963d175a60a7'
---

2c88ed78a67665a962a5b9a5e977cbed8b333c22