From: Adrian Davey <ade@beth2.org>
Date: Mon, 16 Jan 2006 16:37:50 +0000 (+0000)
Subject: merge of a49a202a6edf7281ee0864e523a6292173b5be55
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e217552944efc56513ff6bb1cc6d3218a84ca14;p=openembedded.git

merge of a49a202a6edf7281ee0864e523a6292173b5be55
     and ae14c4dfff4901693990f432e22da76054ac4da8
---

6e217552944efc56513ff6bb1cc6d3218a84ca14