From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 18 Aug 2007 13:14:22 +0000 (+0000)
Subject: merge of '7c9631167173e3ba316bc3efd67dece0804859a7'
X-Git-Tag: Release-2010-05/1~8919
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae14e052c68c2666a1152e33ddb227455913766;p=openembedded.git

Merge ... '7c9631167173e3ba316bc3efd67dece0804859a7'
     and '8ae2f68097943e0d2ab4479bb2e0e0a568de60fd'
---

5ae14e052c68c2666a1152e33ddb227455913766