From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 4 Jul 2007 07:15:21 +0000 (+0000)
Subject: merge of '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
X-Git-Tag: Release-2010-05/1~8868^2~228
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3acbf74f8f8890f4af9d875d052e45036f546613;p=openembedded.git

Merge ... '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
     and 'f3281034536642327c1e507cb7559b3899f99d18'
---

3acbf74f8f8890f4af9d875d052e45036f546613