From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 1 Jul 2008 22:12:23 +0000 (+0000)
Subject: merge of '64064cb2195e13dcea4cf2698037a9183688cd68'
X-Git-Tag: Release-2010-05/1~6553^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=952987d5a7343432e559f231e3b07bbfdd6e0c05;p=openembedded.git

Merge ... '64064cb2195e13dcea4cf2698037a9183688cd68'
     and 'dab6b9ac9cf3985b3daa6239feb3e7f12acdd0f9'
---

952987d5a7343432e559f231e3b07bbfdd6e0c05