From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Sep 2006 21:20:30 +0000 (+0000)
Subject: merge of '4b947022d295cf54343e477171aae5c39c73865f'
X-Git-Tag: Release-2010-05/1~9453^2~762
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aabbfd91b7bfa305d450b62d3e8405d3cea0d3d0;p=openembedded.git

Merge ... '4b947022d295cf54343e477171aae5c39c73865f'
     and '59ea48e552117b87f1c03767f7f608bf3e852fc4'
---

aabbfd91b7bfa305d450b62d3e8405d3cea0d3d0