From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 9 Oct 2008 08:00:09 +0000 (+0000)
Subject: merge of '2e9358fe57665ae0d14365c94a62792b10e1b578'
X-Git-Tag: Release-2010-05/1~5850^2~7^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4c6706e6bac462524f736010eb11fa0729e463;p=openembedded.git

Merge ... '2e9358fe57665ae0d14365c94a62792b10e1b578'
     and 'b926346694764187095a5101a505ba5ad9128a78'
---

7d4c6706e6bac462524f736010eb11fa0729e463