From: Matthias Hentges <oe@hentges.net>
Date: Wed, 22 Nov 2006 23:41:02 +0000 (+0000)
Subject: merge of 'c29c2d80a9c5a2b26cc0510f7c58f76201aaebf0'
X-Git-Tag: Release-2010-05/1~9453^2~324
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ecff9b21111cace7d073669bde234f68002bd94;p=openembedded.git

Merge ... 'c29c2d80a9c5a2b26cc0510f7c58f76201aaebf0'
     and 'd911fb03b7332d3d2f9b04109ce91081f3062e71'
---

3ecff9b21111cace7d073669bde234f68002bd94