From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 20 Mar 2006 09:39:17 +0000 (+0000)
Subject: merge of 0cd761de98072480e6e68e383c48e38bedd2f557
X-Git-Tag: Release-2010-05/1~9453^2~2205
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86629673742ddb672f54f224a85d668aee7955c7;p=openembedded.git

merge of 0cd761de98072480e6e68e383c48e38bedd2f557
     and 52ebc3713b5433a8127e7b025d8d2f4f085214e8
---

86629673742ddb672f54f224a85d668aee7955c7