From: Koen Kooi <koen@openembedded.org>
Date: Sat, 13 May 2006 18:27:19 +0000 (+0000)
Subject: merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
X-Git-Tag: Release-2010-05/1~9453^2~1709
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=348f2ded2310934f32774fce605625e2976a2d5e;p=openembedded.git

merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
     and c8459c74f176dc141188b488b5c3e56beb6ebf13
---

348f2ded2310934f32774fce605625e2976a2d5e