From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Mar 2008 23:58:54 +0000 (+0000)
Subject: merge of '32e15a2c3c11153e8886b20192817c1ff773b323'
X-Git-Tag: Release-2010-05/1~7497^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98c5a9cfc78a6acf632f2294d5e9cbd3e1226999;p=openembedded.git

Merge ... '32e15a2c3c11153e8886b20192817c1ff773b323'
     and '5ecfc6cd9727453503405bbb7de81a74344de218'
---

98c5a9cfc78a6acf632f2294d5e9cbd3e1226999