From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Mar 2008 22:35:44 +0000 (+0000)
Subject: merge of '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
X-Git-Tag: Release-2010-05/1~7550^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d244fcd518a4aa0ec00fe75555e07dcd5be8f47;p=openembedded.git

Merge ... '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
     and '79e634145baa64265863342297f7b440e08d7d22'
---

4d244fcd518a4aa0ec00fe75555e07dcd5be8f47