From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 5 Dec 2007 17:50:18 +0000 (+0000)
Subject: merge of '0fb6c6e17d53f8f9619779a7259b3225d01cf28d'
X-Git-Tag: Release-2010-05/1~8214
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf12eeb7d990c04245634376a596dff6984e46fe;p=openembedded.git

Merge ... '0fb6c6e17d53f8f9619779a7259b3225d01cf28d'
     and '1a6625be75631d7dfb75413cb256eef5afb4d507'
---

bf12eeb7d990c04245634376a596dff6984e46fe