From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 15 May 2008 09:10:40 +0000 (+0000)
Subject: merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
X-Git-Tag: Release-2010-05/1~6944^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bad870be75c7b27966971e237f62b4db660ca02;p=openembedded.git

Merge ... '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
     and 'c4f0fa8168863feb54d1292280f576d79b26222f'
---

1bad870be75c7b27966971e237f62b4db660ca02