From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 3 Sep 2008 23:07:39 +0000 (+0000)
Subject: merge of '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
X-Git-Tag: Release-2010-05/1~6164
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8acaa71b400ffbfae66fb3ed2a5a7f7059a51537;p=openembedded.git

Merge ... '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
     and 'b5b94ebf56fcb87ac967b302ae3570b7f59d3dc2'
---

8acaa71b400ffbfae66fb3ed2a5a7f7059a51537