From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 22 Jul 2008 12:50:02 +0000 (+0000)
Subject: merge of '05c935a7653c0d015e410ba1c92bd8909528d2d0'
X-Git-Tag: Release-2010-05/1~6497
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be5582e5cd17e6ac56d96c2a9fa1bf7334e4cfca;p=openembedded.git

Merge ... '05c935a7653c0d015e410ba1c92bd8909528d2d0'
     and '66afa730ae13c8e2f76b43a319e6c5be9e46c981'
---

be5582e5cd17e6ac56d96c2a9fa1bf7334e4cfca