From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 14 Sep 2008 23:05:28 +0000 (+0000)
Subject: merge of 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'
X-Git-Tag: Release-2010-05/1~6089^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553cb265aeec877b03a2eeddb9740196e5a4e05c;p=openembedded.git

Merge ... 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'
     and 'f9d110b5aa39df7718381524083e62d3f8f7a5f0'
---

553cb265aeec877b03a2eeddb9740196e5a4e05c