From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 22 Aug 2006 11:08:33 +0000 (+0000)
Subject: merge of '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac916651b26667327d7f78e33801cbd4e6bff8ed;p=openembedded.git

Merge ... '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
     and 'bb05117c7225627eddadd5005388bf209a7d68d8'
---

ac916651b26667327d7f78e33801cbd4e6bff8ed