From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 4 Jan 2007 11:22:16 +0000 (+0000)
Subject: merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7e6a49215b00d0cfa9a0fde3808f032a9599e5;p=openembedded.git

Merge ... '274cb1a3f97188420857e4b0650a1ace718148a6'
     and '8091ca9b08503f4700e05ee8973cec755727ed4a'
---

4b7e6a49215b00d0cfa9a0fde3808f032a9599e5