From: Koen Kooi <koen@openembedded.org>
Date: Tue, 7 Nov 2006 12:19:58 +0000 (+0000)
Subject: merge of '5f21c437aa0fff306d71bc8a8df1b5108b220a05'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~47^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c124c2ab24a82182ed6c1d6f63e9d55aa3db2994;p=openembedded.git

Merge ... '5f21c437aa0fff306d71bc8a8df1b5108b220a05'
     and '9bb2161deb1eda6a77ebfd26459243bc0120aeae'
---

c124c2ab24a82182ed6c1d6f63e9d55aa3db2994