From: Koen Kooi <koen@openembedded.org>
Date: Wed, 22 Feb 2006 11:06:23 +0000 (+0000)
Subject: merge of 0db003fda92c4fe80ee76010788aa8e895b485eb
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~86
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a200152a3e40b0897a164328a48d3c88c31384;p=openembedded.git

merge of 0db003fda92c4fe80ee76010788aa8e895b485eb
     and 84edeec7571f3127230e5ca62b68488474946bcf
---

74a200152a3e40b0897a164328a48d3c88c31384