From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 23 Jul 2006 14:19:49 +0000 (+0000)
Subject: merge of 206b9c34335d6624ecb83fa31c72e4d6fbe3b541
X-Git-Tag: Release-2010-05/1~9453^2~1197
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ade510f39625ad0a6744db95160f661ab4bbd1e;p=openembedded.git

merge of 206b9c34335d6624ecb83fa31c72e4d6fbe3b541
     and da3bdc9f7b7872511bed7da95bbe562ffd88f6fe
---

7ade510f39625ad0a6744db95160f661ab4bbd1e