From: Koen Kooi <koen@openembedded.org>
Date: Wed, 27 Dec 2006 17:48:05 +0000 (+0000)
Subject: merge of '2040fbc4df2aa380693c353ed60010c6857265d0'
X-Git-Tag: Release-2010-05/1~9453^2~99
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68c29774381ed759c536272caba3269a38e552d;p=openembedded.git

Merge ... '2040fbc4df2aa380693c353ed60010c6857265d0'
     and '42910a78bf244958e7c8329dfa9474915a321d73'
---

a68c29774381ed759c536272caba3269a38e552d