From: Koen Kooi <koen@openembedded.org>
Date: Mon, 12 Sep 2005 10:13:14 +0000 (+0000)
Subject: merge of 014c14278f078f6dfed141f49e7c46dc3a059ae9
X-Git-Tag: Release-2010-05/1~9453^2~3548
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2958e36d6fa99af4d5b70e9dac22013ca80158b0;p=openembedded.git

merge of 014c14278f078f6dfed141f49e7c46dc3a059ae9
     and 8decd470419c4875b29486bd2b5a7012bedb9427
---

2958e36d6fa99af4d5b70e9dac22013ca80158b0