From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 18 Jan 2006 10:54:38 +0000 (+0000)
Subject: merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
X-Git-Tag: Release-2010-05/1~9453^2~2631^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec51545a229f2400954e6ef1680d9874f8bc32b6;p=openembedded.git

merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623
---

ec51545a229f2400954e6ef1680d9874f8bc32b6