From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 3 Jul 2007 19:48:28 +0000 (+0000)
Subject: merge of '290305d126092679b5d9b8f4f299b6dce4dd8da6'
X-Git-Tag: Release-2010-05/1~8868^2~235
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6044bbbbc60cffed8c5472a0cb6f2e70c2a2cd1d;p=openembedded.git

Merge ... '290305d126092679b5d9b8f4f299b6dce4dd8da6'
     and 'dac58e411440987135799adb8235fe46a6d6e1c7'
---

6044bbbbc60cffed8c5472a0cb6f2e70c2a2cd1d