From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 2 Aug 2007 13:36:31 +0000 (+0000)
Subject: merge of '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
X-Git-Tag: Release-2010-05/1~8868^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96247505abe090eb267226156d9e06a5c2e12192;p=openembedded.git

Merge ... '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
     and '9ca4252efb9948ce173f616c937012398a0b2c42'
---

96247505abe090eb267226156d9e06a5c2e12192