From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 20 Oct 2006 19:07:38 +0000 (+0000)
Subject: merge of '1f09cd3a225e9cc6002c73f2660f6619f10f9e59'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8318f04decd1f08054633d7110a1a1e4874726;p=openembedded.git

Merge ... '1f09cd3a225e9cc6002c73f2660f6619f10f9e59'
     and '8c1fecdaef7355feda28b9b87ce84a94e1698804'
---

ea8318f04decd1f08054633d7110a1a1e4874726