From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 21 Aug 2007 15:18:13 +0000 (+0000)
Subject: merge of '3289b5a802bb36f84f72d159c65ca3869e90041e'
X-Git-Tag: Release-2010-05/1~8857
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=518eaefe12d6df0580699ce600a709adac1e15d9;p=openembedded.git

Merge ... '3289b5a802bb36f84f72d159c65ca3869e90041e'
     and '5ee4afc833aaf754d4605b6c97860c3016037b3e'
---

518eaefe12d6df0580699ce600a709adac1e15d9