From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 1 Sep 2008 18:12:27 +0000 (+0000)
Subject: merge of '2044642e8174795647f8a119435ed8787c7aff99'
X-Git-Tag: Release-2010-05/1~6173^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a637f0c537b380165e61755028a26894b58e4f14;p=openembedded.git

Merge ... '2044642e8174795647f8a119435ed8787c7aff99'
     and 'cbe3c01bd8b49af467a1371cedad2d5cf2e6654c'
---

a637f0c537b380165e61755028a26894b58e4f14