From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 10 Feb 2008 15:14:10 +0000 (+0000)
Subject: merge of '1f570b878b7faa73a50263f281ff2bad89d0e78b'
X-Git-Tag: Release-2010-05/1~7696^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fba1b3f2708865f7a0d60b0472d5ab84b85cfdd;p=openembedded.git

Merge ... '1f570b878b7faa73a50263f281ff2bad89d0e78b'
     and 'be55d0d4fe08efd2bd552157f130e03ccd5ac65a'
---

7fba1b3f2708865f7a0d60b0472d5ab84b85cfdd