From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 15 May 2008 18:12:20 +0000 (+0000)
Subject: merge of '23febe44719cb1ea7557c584ce7c762da82df4d5'
X-Git-Tag: Release-2010-05/1~6938
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdae4c0d753b265ab2a0462a6b42b9195d5c331c;p=openembedded.git

Merge ... '23febe44719cb1ea7557c584ce7c762da82df4d5'
     and '5fdefb8b4b08bb2ea1670328ae0c67e3d5335805'
---

cdae4c0d753b265ab2a0462a6b42b9195d5c331c