From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 24 Jun 2008 16:24:25 +0000 (+0000)
Subject: merge of '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
X-Git-Tag: Release-2010-05/1~6633
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=212b8e0a0ce35130400d7671792b166273730bab;p=openembedded.git

Merge ... '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
     and 'dd270d37a9758c7acdca59383935fd9cadad3aa8'
---

212b8e0a0ce35130400d7671792b166273730bab