From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 7 Jun 2008 18:32:46 +0000 (+0000)
Subject: merge of '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
X-Git-Tag: Release-2010-05/1~6796
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc5badca3d35f936648529a0c22b1ff4d6a86477;p=openembedded.git

Merge ... '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
     and '82ea7fb33a9e64c710458f33fd0c1649c08f7e01'
---

dc5badca3d35f936648529a0c22b1ff4d6a86477