From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 17 Jan 2007 20:38:02 +0000 (+0000)
Subject: merge of 'b7543cd2dc462a6eac2d07da5b8a046d889abacb'
X-Git-Tag: Release-2010-05/1~9361^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c1df3e2615df450f968c1b677011ba8d9c17b0a;p=openembedded.git

Merge ... 'b7543cd2dc462a6eac2d07da5b8a046d889abacb'
     and 'cc2d03ff9706820f2a9118101188cf7e270a188e'
---

7c1df3e2615df450f968c1b677011ba8d9c17b0a