From: Koen Kooi <koen@openembedded.org>
Date: Sun, 8 Jan 2006 00:09:23 +0000 (+0000)
Subject: merge of 259a4ccadefe0737612a849ff810ce6a4debd589
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ac9d52d1b2fb6008774f1267f707c7c6a7c4b06;p=openembedded.git

merge of 259a4ccadefe0737612a849ff810ce6a4debd589
     and 5f40addfed07ed4b104416c2d8464fe20c5ba399
---

7ac9d52d1b2fb6008774f1267f707c7c6a7c4b06