From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Oct 2006 14:56:14 +0000 (+0000)
Subject: merge of '0fcb36ac99d9411a139d45f77b738646aaab2ebf'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~162^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de7e35e2cac6c09c195700a14e59775f732edb11;p=openembedded.git

Merge ... '0fcb36ac99d9411a139d45f77b738646aaab2ebf'
     and '68939422dc88f64f4831bce0644266a1875c335b'
---

de7e35e2cac6c09c195700a14e59775f732edb11