From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 23 Aug 2007 12:23:06 +0000 (+0000)
Subject: merge of '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
X-Git-Tag: Release-2010-05/1~8811^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32a0895591cb085f7e71b7d83b9f73782d20cc3d;p=openembedded.git

Merge ... '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
     and 'e30e879439bfeb0f5e33edf2a3e8bfa1828eed4f'
---

32a0895591cb085f7e71b7d83b9f73782d20cc3d