From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jul 2008 16:27:09 +0000 (+0000)
Subject: merge of '0521752c751b5734b320120045655229b2faff4f'
X-Git-Tag: Release-2010-05/1~6425
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b25c25786a838e45da53567321bd349ca1bb2c;p=openembedded.git

Merge ... '0521752c751b5734b320120045655229b2faff4f'
     and 'f75d239d7378665c50aea95b24abbfc6a815bd43'
---

80b25c25786a838e45da53567321bd349ca1bb2c