From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 25 Jan 2006 21:44:26 +0000 (+0000)
Subject: merge of 38811a337536b285df71efc4a3eb4cdb3f911310
X-Git-Tag: Release-2010-05/1~9453^2~2551
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4554235a3451616714b4a4c1ae88ed80fa50ea;p=openembedded.git

merge of 38811a337536b285df71efc4a3eb4cdb3f911310
     and b8a8ab513bcf0fd86ab534ece626c74e6b41b41d
---

2b4554235a3451616714b4a4c1ae88ed80fa50ea