From: Koen Kooi <koen@openembedded.org>
Date: Tue, 26 Dec 2006 16:56:59 +0000 (+0000)
Subject: merge of '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=729fb4872a95d30f8197c96b04282a8ea28943c0;p=openembedded.git

Merge ... '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
     and 'c1c4d0a65a54044d7912fc57f4f76f391fb4df16'
---

729fb4872a95d30f8197c96b04282a8ea28943c0