From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 30 Dec 2007 16:44:17 +0000 (+0000)
Subject: merge of '1887e05997e5d1f748a52eec6b2d13c49a073d4c'
X-Git-Tag: Release-2010-05/1~8050^2~11^2~11^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99d6885374c4957e8a1b61c4dc23a7d770f3f6d9;p=openembedded.git

Merge ... '1887e05997e5d1f748a52eec6b2d13c49a073d4c'
     and '3097cec884e81b132a9e898dffce71a333d6484c'
---

99d6885374c4957e8a1b61c4dc23a7d770f3f6d9