From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 31 Jul 2008 10:19:09 +0000 (+0000)
Subject: merge of '5f80d82b77d53ef77154af1dcd9298bf7c5f389d'
X-Git-Tag: Release-2010-05/1~6413^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03912c8ebd075977a9256ff22b95419fe5ab5e5d;p=openembedded.git

Merge ... '5f80d82b77d53ef77154af1dcd9298bf7c5f389d'
     and 'e10700938896fb54483d9c1a8c452585cdd764be'
---

03912c8ebd075977a9256ff22b95419fe5ab5e5d