From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 15 Sep 2007 23:22:36 +0000 (+0000)
Subject: merge of 'bba23ca6193d5f2eb30e36c878736204560ca83d'
X-Git-Tag: Release-2010-05/1~8625^2~95
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7693f87483b98d5db193b12021f79856a0a6641;p=openembedded.git

Merge ... 'bba23ca6193d5f2eb30e36c878736204560ca83d'
     and 'd23a37e33429ad715c4689a5170e23c795946d2e'
---

f7693f87483b98d5db193b12021f79856a0a6641