From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 24 Oct 2007 08:21:25 +0000 (+0000)
Subject: merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'
X-Git-Tag: Release-2010-05/1~8454^2~157^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15923ae1527b4da767f067b8c166625ad28375ad;p=openembedded.git

Merge ... '8be6702870d00e547e81f68f3feffa5ba236e7ac'
     and 'cbec50f53eb6e573a76ee660b0607c64d3e95d99'
---

15923ae1527b4da767f067b8c166625ad28375ad