From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 1 Jul 2008 17:47:38 +0000 (+0000)
Subject: merge of '0ee4237d44d0abae9c6a87517d5a56c8a8fb110e'
X-Git-Tag: Release-2010-05/1~6553^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2c4f1b9727b3858e9550c243c67782ab6b2781;p=openembedded.git

Merge ... '0ee4237d44d0abae9c6a87517d5a56c8a8fb110e'
     and '410cd788a5109a93ca33f19e5fd6f567a6e8adef'
---

9a2c4f1b9727b3858e9550c243c67782ab6b2781