From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Sep 2007 15:44:58 +0000 (+0000)
Subject: merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
X-Git-Tag: Release-2010-05/1~8696
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=496383e73baaaeae20a3e8c21785e9ef66182899;p=openembedded.git

Merge ... '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
     and 'bc1bceb6bfab051d162269a77df02ea351b62358'
---

496383e73baaaeae20a3e8c21785e9ef66182899