From: Koen Kooi <koen@openembedded.org>
Date: Thu, 11 May 2006 17:22:12 +0000 (+0000)
Subject: merge of 311e1d1fc2eefa2efc02e72f033f7f8ff3d1099b
X-Git-Tag: Release-2010-05/1~9453^2~1717
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2d992e4bbff033b0233d2f6076c7d90a3b6a2b;p=openembedded.git

merge of 311e1d1fc2eefa2efc02e72f033f7f8ff3d1099b
     and ea43be5f9ba4797b6cf391313e04bfb636e692db
---

bb2d992e4bbff033b0233d2f6076c7d90a3b6a2b