From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 14 Jul 2008 11:20:50 +0000 (+0000)
Subject: merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa9f2080e8d8fd8220976415b2bd7bde3ccc620;p=openembedded.git

Merge ... 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
     and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'
---

4fa9f2080e8d8fd8220976415b2bd7bde3ccc620