From: Koen Kooi <koen@openembedded.org>
Date: Wed, 12 Jul 2006 15:55:08 +0000 (+0000)
Subject: merge of a0cb602edb3bf2f732004fc35bed483bf4b559f7
X-Git-Tag: Release-2010-05/1~9453^2~1237^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c061919b6b36e89aeb508dde90a7cf5fe2dc309;p=openembedded.git

merge of a0cb602edb3bf2f732004fc35bed483bf4b559f7
     and bc5f5478302c34ee064f2f5e7ca8c51c0e226de5
---

5c061919b6b36e89aeb508dde90a7cf5fe2dc309