From: Koen Kooi <koen@openembedded.org>
Date: Thu, 6 Jul 2006 13:01:47 +0000 (+0000)
Subject: merge of 94e87f750741788f0f284fbad40cb6eddee8f689
X-Git-Tag: Release-2010-05/1~9453^2~1325
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3adac48aa7d3ba50ea1b7c9c158ed592ba9f79;p=openembedded.git

merge of 94e87f750741788f0f284fbad40cb6eddee8f689
     and 9fcf759108403d55361b6910f3dbc57f0fa9431d
---

be3adac48aa7d3ba50ea1b7c9c158ed592ba9f79