From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 3 Jul 2008 12:57:07 +0000 (+0000)
Subject: merge of '00cf1e9e9df723231465c5cf66641ccf532f713a'
X-Git-Tag: Release-2010-05/1~6553^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e13e415084ca0399e0df7035654b9b7afdfb4c;p=openembedded.git

Merge ... '00cf1e9e9df723231465c5cf66641ccf532f713a'
     and 'e238a221b694e010f2ded33d137e1ca76dec2b4f'
---

20e13e415084ca0399e0df7035654b9b7afdfb4c