From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 21 Mar 2008 23:26:41 +0000 (+0000)
Subject: merge of '17fe5a20eddea57fb860ffa0652cc78cda424804'
X-Git-Tag: Release-2010-05/1~7299^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=507f5c47f31dc102d925959788af4ae8ddb5f6c9;p=openembedded.git

Merge ... '17fe5a20eddea57fb860ffa0652cc78cda424804'
     and '281a5681239793312291488e7b216ecbdfce9b33'
---

507f5c47f31dc102d925959788af4ae8ddb5f6c9