From: Koen Kooi <koen@openembedded.org>
Date: Mon, 29 May 2006 13:38:10 +0000 (+0000)
Subject: merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
X-Git-Tag: Release-2010-05/1~9453^2~1567
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad7da861459bf8b1a42c04de819c1bc9c44534d;p=openembedded.git

merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
     and 9c65cea979ed9596cf0a6ec6776d094ce174ea6a
---

9ad7da861459bf8b1a42c04de819c1bc9c44534d