From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 29 Aug 2006 10:55:18 +0000 (+0000)
Subject: merge of '872617c69808de974c084a129088813f22b4ca0d'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23649000abf97e000e0970a809307c65c5b9097a;p=openembedded.git

Merge ... '872617c69808de974c084a129088813f22b4ca0d'
     and '8f3da738b3287e652cd9b58552555515d18edc2c'
---

23649000abf97e000e0970a809307c65c5b9097a