From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 23 Oct 2006 17:16:07 +0000 (+0000)
Subject: merge of '08caa01fe78b735fde2c7ca902bf7bfeb6075ff7'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d6366b500dfe1ab4ee228d4a180729dcf49c713;p=openembedded.git

Merge ... '08caa01fe78b735fde2c7ca902bf7bfeb6075ff7'
     and 'fb2a1b3eb36c91c1ab88e790f436f8c166ab7a7f'
---

0d6366b500dfe1ab4ee228d4a180729dcf49c713