From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 18 Aug 2006 15:18:32 +0000 (+0000)
Subject: merge of 'b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc'
X-Git-Tag: Release-2010-05/1~9453^2~927
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f80e66dba22c67549dac232d191c335bd023b35;p=openembedded.git

Merge ... 'b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc'
     and 'f9c6177ac97fd742ce5f6eb06a988296fa777bda'
---

4f80e66dba22c67549dac232d191c335bd023b35