From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 25 Jul 2008 11:28:04 +0000 (+0000)
Subject: merge of '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
X-Git-Tag: Release-2010-05/1~6454^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a8127e2c74b23889e63ad749f8d9949f1fca2b;p=openembedded.git

Merge ... '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
     and '312397dbc5a5ae102fde8714c41666b07b74ee8a'
---

a0a8127e2c74b23889e63ad749f8d9949f1fca2b