From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 21 Jul 2008 22:51:07 +0000 (+0000)
Subject: merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
X-Git-Tag: Release-2010-05/1~6507
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6ecf118e3a541c4a6ab2abcf9b4a18d40e33469;p=openembedded.git

Merge ... '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
     and 'b7c57ac566ade9b73a2dc88a9400d0667d979c84'
---

b6ecf118e3a541c4a6ab2abcf9b4a18d40e33469