From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 7 Sep 2007 20:15:38 +0000 (+0000)
Subject: merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
X-Git-Tag: Release-2010-05/1~8696^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09a497b2fd5df58ac5b9deec9830b3a9bbc6342f;p=openembedded.git

Merge ... '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
     and 'a12d2158881e274d028f6fb907b2bd832647e870'
---

09a497b2fd5df58ac5b9deec9830b3a9bbc6342f