From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 29 Dec 2006 11:11:46 +0000 (+0000)
Subject: merge of '3961d9fa0932ee3f91d25b24350816ff1c3c7ff8'
X-Git-Tag: Release-2010-05/1~9453^2~86
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4f2b6e1d0bc68b738d9d1428a2ebb6c6d2014df;p=openembedded.git

Merge ... '3961d9fa0932ee3f91d25b24350816ff1c3c7ff8'
     and '91d610fe22ec5f30832680d42abf443bcd99fe6c'
---

e4f2b6e1d0bc68b738d9d1428a2ebb6c6d2014df