From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 16:11:45 +0000 (+0000)
Subject: merge of 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
X-Git-Tag: Release-2010-05/1~7948^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d100cb85635a4112a0973a2c57d43ef860ce4103;p=openembedded.git

Merge ... 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
     and 'fc9ea88e83e327d8456fd79595597c637950b850'
---

d100cb85635a4112a0973a2c57d43ef860ce4103