From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 3 Jan 2007 12:25:21 +0000 (+0000)
Subject: merge of '00ab42cecad6f3cff7e430dfe1e456ffab6ee08c'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef937c49f30fa5b7c6656c7f9814cb1fb161e070;p=openembedded.git

Merge ... '00ab42cecad6f3cff7e430dfe1e456ffab6ee08c'
     and '886f590eaf51aa5f80dff32c73a8d713ce989b3c'
---

ef937c49f30fa5b7c6656c7f9814cb1fb161e070