From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 24 Apr 2008 12:19:18 +0000 (+0000)
Subject: merge of '3a47981fd330163efa2f76ef144ec299e22bfa96'
X-Git-Tag: Release-2010-05/1~7113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f5ffc9531471696cbe116c976cf35eff590fbde;p=openembedded.git

Merge ... '3a47981fd330163efa2f76ef144ec299e22bfa96'
     and '3afb4ffc02c1e4bde1031645cfa9f8e5465f2138'
---

6f5ffc9531471696cbe116c976cf35eff590fbde