From: Koen Kooi <koen@openembedded.org>
Date: Thu, 11 May 2006 08:25:03 +0000 (+0000)
Subject: merge of 34a4cccc8cdb74f4173031879341a1dcedfc7e31
X-Git-Tag: Release-2010-05/1~9453^2~1730
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc33487089ff9a1ff1feaf77f2ea7934207d19c;p=openembedded.git

merge of 34a4cccc8cdb74f4173031879341a1dcedfc7e31
     and a9e4bb6b87ea6a9da3a9830289da0aeddb70f467
---

7cc33487089ff9a1ff1feaf77f2ea7934207d19c