From: Koen Kooi <koen@openembedded.org>
Date: Sun, 8 Jan 2006 00:03:54 +0000 (+0000)
Subject: merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~9^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3345eb6dcb5a0025e693cfd9e5fda2e979947227;p=openembedded.git

merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
     and 72409a634bd5ef5e1a72c253a907fbec85506604
---

3345eb6dcb5a0025e693cfd9e5fda2e979947227