From: Koen Kooi <koen@openembedded.org>
Date: Sat, 8 Jul 2006 14:47:06 +0000 (+0000)
Subject: merge of 7af01deb5f2ccfe6a46c47c7d3366897760b7f50
X-Git-Tag: Release-2010-05/1~9453^2~1287
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d160eca8a1eec85bbaffcfca8c2fab12c71699df;p=openembedded.git

merge of 7af01deb5f2ccfe6a46c47c7d3366897760b7f50
     and c1685b2c79265f6c5323c93187c06401cf52accb
---

d160eca8a1eec85bbaffcfca8c2fab12c71699df