From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 4 Feb 2006 17:13:07 +0000 (+0000)
Subject: merge of 389a6b49ea576bc4497ab65b4d78d6a487c90d2d
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e7da9bc380cb44e1740fbf95a0be8f969e023f;p=openembedded.git

merge of 389a6b49ea576bc4497ab65b4d78d6a487c90d2d
     and ecdfae8924d6c3ddfeb4f20ff811f18b2bca889f
---

03e7da9bc380cb44e1740fbf95a0be8f969e023f