From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 9 Jan 2007 20:07:40 +0000 (+0000)
Subject: merge of '23b499709c194edb8a59cac3432c10a63e6a952d'
X-Git-Tag: Release-2010-05/1~9360^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0c3e066006f6e8be669fc4af6ece8749cebe75;p=openembedded.git

Merge ... '23b499709c194edb8a59cac3432c10a63e6a952d'
     and '936fcb645dcae65ff05db814bd104083a0194fb0'
---

6a0c3e066006f6e8be669fc4af6ece8749cebe75