From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 7 Dec 2006 21:19:07 +0000 (+0000)
Subject: merge of '290a4d774320220c9ab2a3fa23f71d7277d2551f'
X-Git-Tag: Release-2010-05/1~9453^2~173^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c25572a5c012d2687ba685ceddabe46b1fb616;p=openembedded.git

Merge ... '290a4d774320220c9ab2a3fa23f71d7277d2551f'
     and '9bf79930fdbeb107188631d9e38d57f850e38c00'
---

02c25572a5c012d2687ba685ceddabe46b1fb616