From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 16 Oct 2006 20:04:58 +0000 (+0000)
Subject: merge of '7766951901c250170ac71fd9268ec9c8e230e2e3'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ed86ffbe8a2d0697c8020fe19390ebc6a5ff74;p=openembedded.git

Merge ... '7766951901c250170ac71fd9268ec9c8e230e2e3'
     and '96fb434736327df64b56d0ab9a6a36fcf759486a'
---

e6ed86ffbe8a2d0697c8020fe19390ebc6a5ff74