From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 1 Jun 2008 12:23:21 +0000 (+0000)
Subject: merge of '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'
X-Git-Tag: Release-2010-05/1~6842^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d69fd172c6e48679d54aa3e6767fb0cd357fc416;p=openembedded.git

Merge ... '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'
     and 'a66740dc82701e8bcaf09d803b69b8601b7efb2d'
---

d69fd172c6e48679d54aa3e6767fb0cd357fc416