From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sat, 16 Dec 2006 15:50:53 +0000 (+0000)
Subject: merge of '0285e32ca4006ec769b788f9d74dac4d57326bf4'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8d54ebb210cda9477e57bd7c9fa48092f930856;p=openembedded.git

Merge ... '0285e32ca4006ec769b788f9d74dac4d57326bf4'
     and '08336880338eaa13f4281f4b644f44ab9fb3014c'
---

e8d54ebb210cda9477e57bd7c9fa48092f930856