From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Sep 2007 23:50:02 +0000 (+0000)
Subject: merge of 'c231987751696ab580afb27261789a5becb2c0bd'
X-Git-Tag: Release-2010-05/1~8689
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7abdb3be188a3586a0687afe185041336c2f0dca;p=openembedded.git

Merge ... 'c231987751696ab580afb27261789a5becb2c0bd'
     and 'c3f0afcb1172d319278bd0ef4ba8c811cab4ada2'
---

7abdb3be188a3586a0687afe185041336c2f0dca