From: Koen Kooi <koen@openembedded.org>
Date: Sun, 5 Nov 2006 22:29:52 +0000 (+0000)
Subject: merge of '79ea02243e94fe9936f10935156fe8832b208e82'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ce67451c7bf9b59f122b164257a9d199d2434cd;p=openembedded.git

Merge ... '79ea02243e94fe9936f10935156fe8832b208e82'
     and '8bdc2454df92b6e1dd4a83179a268f6e4e9bb972'
---

6ce67451c7bf9b59f122b164257a9d199d2434cd