From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 6 Feb 2008 16:42:44 +0000 (+0000)
Subject: merge of '298797d86056bd55b8e0191685cb8ae42de55f7d'
X-Git-Tag: Release-2010-05/1~7713^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f29644efce44f9059fb290b644047caf9146c1b;p=openembedded.git

Merge ... '298797d86056bd55b8e0191685cb8ae42de55f7d'
     and 'e3a17e2ff263cac6d4b035034dc79a0e05fc548d'
---

8f29644efce44f9059fb290b644047caf9146c1b