From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Jun 2008 21:50:29 +0000 (+0000)
Subject: merge of '112ba3baa73bf6c445009481cef0ee0f5371e549'
X-Git-Tag: Release-2010-05/1~6646
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa6500797b94e356b2840da4edd80c315e30b884;p=openembedded.git

Merge ... '112ba3baa73bf6c445009481cef0ee0f5371e549'
     and 'baa34221f43a077c05372f6d2f1e4931e764d666'
---

fa6500797b94e356b2840da4edd80c315e30b884