From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 27 Sep 2008 18:49:28 +0000 (+0000)
Subject: merge of '42ff2b39da1a828b39b2827ebefd91262b2ea728'
X-Git-Tag: Release-2010-05/1~5913
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98fee68c313537aeaf56617cf49cf67a10f1b8c5;p=openembedded.git

Merge ... '42ff2b39da1a828b39b2827ebefd91262b2ea728'
     and '513ef8343cdc8a1d5beb9c8fa5298efc58162ffe'
---

98fee68c313537aeaf56617cf49cf67a10f1b8c5