From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 26 Jul 2008 15:58:45 +0000 (+0000)
Subject: merge of 'aeb1ac8ac964032ee256054d8009fd226a984570'
X-Git-Tag: Release-2010-05/1~6469
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8c7c4f3c4a4606a69cc8e11f7bfad0b9a0dede8;p=openembedded.git

Merge ... 'aeb1ac8ac964032ee256054d8009fd226a984570'
     and 'b86db14f5edd4f268d21ba089697b479d09548ce'
---

b8c7c4f3c4a4606a69cc8e11f7bfad0b9a0dede8