From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 2 Jul 2008 11:16:56 +0000 (+0000)
Subject: merge of '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
X-Git-Tag: Release-2010-05/1~6553^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=102eaa322eb18302832a1059e8ba1f12aeb5a679;p=openembedded.git

Merge ... '0cb6ae9adc44c4c9b9075a61d9a73a9c2978e89d'
     and '61916fde303a24e027564cf07127b974edcf2ce8'
---

102eaa322eb18302832a1059e8ba1f12aeb5a679