From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 21 Apr 2008 00:42:58 +0000 (+0000)
Subject: merge of 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
X-Git-Tag: Release-2010-05/1~7160
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e263956d2b6c222f1a105fbfa2eb8abdcc14237;p=openembedded.git

Merge ... 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
     and 'ec238858461bb40d136b48ac17f1ad9ee6b50c9e'
---

7e263956d2b6c222f1a105fbfa2eb8abdcc14237