From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 23:02:45 +0000 (+0000)
Subject: merge of '389aed28979c814d3706b4a96498170e50800a5b'
X-Git-Tag: Release-2010-05/1~8136^2~44^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f696bb12f7f311b65b2a1522299428917cf4311;p=openembedded.git

Merge ... '389aed28979c814d3706b4a96498170e50800a5b'
     and 'f5aa47e401818b4b23bbbe7d7d767f86adbe7858'
---

8f696bb12f7f311b65b2a1522299428917cf4311