From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 29 Mar 2007 14:17:01 +0000 (+0000)
Subject: merge of 'a169800c21f9c42630c25ab09b4da7ca73dac614'
X-Git-Tag: Release-2010-05/1~8868^2~912^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36d9a4f1fa39a94b5832c2569547dd3bd5106cf2;p=openembedded.git

Merge ... 'a169800c21f9c42630c25ab09b4da7ca73dac614'
     and 'a5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788'
---

36d9a4f1fa39a94b5832c2569547dd3bd5106cf2