From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 18 Jan 2008 15:14:24 +0000 (+0000)
Subject: merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
X-Git-Tag: Release-2010-05/1~7889
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4801c8709e4ac47a1e633137b5b6355b3f85ba97;p=openembedded.git

Merge ... '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
     and 'cc72cefccea1756ea052a54b2ec73e0ef6e3d9eb'
---

4801c8709e4ac47a1e633137b5b6355b3f85ba97