From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 May 2006 12:26:48 +0000 (+0000)
Subject: merge of 314e9e28fab0e5aff2e8901741180ce581d7e1fa
X-Git-Tag: Release-2010-05/1~9453^2~1730^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a7622d3f3944296c5c702f0c7cae167a2b777cc;p=openembedded.git

merge of 314e9e28fab0e5aff2e8901741180ce581d7e1fa
     and 9ef3a8d33b02c1d8a4cc2ad6eaee9326b019c33a
---

4a7622d3f3944296c5c702f0c7cae167a2b777cc