From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 1 Jun 2008 17:34:13 +0000 (+0000)
Subject: merge of '7c7739053ba5cdf8bff6f5a8f4fbc67e37462db4'
X-Git-Tag: Release-2010-05/1~6842^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64fe0c0449e489d0fdb3f3dd589b1553eb433160;p=openembedded.git

Merge ... '7c7739053ba5cdf8bff6f5a8f4fbc67e37462db4'
     and 'e6a459c55425abe66caef6b80f6fab95fb04c868'
---

64fe0c0449e489d0fdb3f3dd589b1553eb433160