From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Aug 2006 21:00:38 +0000 (+0000)
Subject: merge of 'aebf88ce897b2503c671d3dd0b5828248df55257'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~33^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6687a609363ae6b96def51668e9cc307b8edd119;p=openembedded.git

Merge ... 'aebf88ce897b2503c671d3dd0b5828248df55257'
     and 'e61f227fe61100734aa43b3a5076a84a40cf3c3d'
---

6687a609363ae6b96def51668e9cc307b8edd119