From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 10 Mar 2008 16:17:04 +0000 (+0000)
Subject: merge of 'ab5ad4e59f4a6f702c25734887b847d5f8f38376'
X-Git-Tag: Release-2010-05/1~7505
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0938c144f1633b72488e118c38bae614819e340f;p=openembedded.git

Merge ... 'ab5ad4e59f4a6f702c25734887b847d5f8f38376'
     and 'afa1166259e2b444217408569230c95f8384ac5f'
---

0938c144f1633b72488e118c38bae614819e340f