From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 26 Jun 2007 09:40:27 +0000 (+0000)
Subject: merge of '674974b81d2da7e7d81070dc38e8b163632c887e'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~23^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7147e81f2ab5b63ef008189773b926138f99d860;p=openembedded.git

Merge ... '674974b81d2da7e7d81070dc38e8b163632c887e'
     and '89afd3974ed8a86d2683d1222dcb1c60b2295772'
---

7147e81f2ab5b63ef008189773b926138f99d860