From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 16 May 2006 21:28:36 +0000 (+0000)
Subject: merge of 309ed8790b9b5f6e51c3bd638a7861ab23c24416
X-Git-Tag: Release-2010-05/1~9453^2~1692^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=487930053e7f2d515c80e6d7de0e4cb4705e96b0;p=openembedded.git

merge of 309ed8790b9b5f6e51c3bd638a7861ab23c24416
     and f41f4b9e61ac9fa58e09e00bf7a7514ce93fb723
---

487930053e7f2d515c80e6d7de0e4cb4705e96b0