From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 12 Mar 2006 15:38:16 +0000 (+0000)
Subject: merge of 21d01652e3aa40ef6aef3a3bc47a1d618d24501d
X-Git-Tag: Release-2010-05/1~9453^2~2233^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e58723dfb051aee843224b87027a08bd0901960f;p=openembedded.git

merge of 21d01652e3aa40ef6aef3a3bc47a1d618d24501d
     and 344ea81de10e1b863ad4c83421c41c9cb8680f36
---

e58723dfb051aee843224b87027a08bd0901960f