From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 14 Jul 2006 09:27:02 +0000 (+0000)
Subject: merge of 1fe9f8d43389439ccd8569c7e3d656fdc6e01b36
X-Git-Tag: Release-2010-05/1~9453^2~1232^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc05e04e43d8c7d1571f24435487cdee3effd49;p=openembedded.git

merge of 1fe9f8d43389439ccd8569c7e3d656fdc6e01b36
     and e67478401de677e4d3ab4253e5a93d4478cd694d
---

7cc05e04e43d8c7d1571f24435487cdee3effd49