From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 25 Jul 2008 12:07:32 +0000 (+0000)
Subject: merge of '11190e741ffccdf2d209ad44d788d7a645b62eef'
X-Git-Tag: Release-2010-05/1~6454^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482c970114f031bce74c3ea7bb548bbe609d905c;p=openembedded.git

Merge ... '11190e741ffccdf2d209ad44d788d7a645b62eef'
     and 'fe8733bd5827d972336bdf138c9082df08f4d847'
---

482c970114f031bce74c3ea7bb548bbe609d905c