From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 4 Oct 2008 16:12:10 +0000 (+0000)
Subject: merge of '878f6895b40f34c695cfef0d475e299f1a2d8eda'
X-Git-Tag: Release-2010-05/1~5850^2~22^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5789b99ac2339ea96cb3d993c55c9f1a71eddf;p=openembedded.git

Merge ... '878f6895b40f34c695cfef0d475e299f1a2d8eda'
     and 'a6240987d2107aef28e1c5419eb7da825ff812f5'
---

3d5789b99ac2339ea96cb3d993c55c9f1a71eddf