From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Dec 2006 13:41:39 +0000 (+0000)
Subject: merge of '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'
X-Git-Tag: Release-2010-05/1~9453^2~171^2~9^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ce3a656d2c65c120454150c87965e731612733a;p=openembedded.git

Merge ... '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'
     and '824441f3a8e403dd32a1171069630d10f7b8d4d1'
---

4ce3a656d2c65c120454150c87965e731612733a