From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Oct 2007 14:06:47 +0000 (+0000)
Subject: merge of '7f726014d804dac37f882d802eea690ed0c00cee'
X-Git-Tag: Release-2010-05/1~8454^2~165
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c67e3327ee97255fda3143a7a013b210d3e614a2;p=openembedded.git

Merge ... '7f726014d804dac37f882d802eea690ed0c00cee'
     and 'de1ed6b33382c6e5abd3af8087cf833ca9a9c78b'
---

c67e3327ee97255fda3143a7a013b210d3e614a2