From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 24 Aug 2008 16:22:34 +0000 (+0000)
Subject: merge of '83199e5f8013253895f505392eddf036d9242fd1'
X-Git-Tag: Release-2010-05/1~6257
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f;p=openembedded.git

Merge ... '83199e5f8013253895f505392eddf036d9242fd1'
     and 'dd12cf1614fbdd04c9791735ee944b266f1c6c74'
---

2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f