From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 23 Aug 2007 08:33:46 +0000 (+0000)
Subject: merge of '8feaf9690f0a2100128b1830f061fb71951fd3f4'
X-Git-Tag: Release-2010-05/1~8826^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d96ae6efdef0d81a0d122588f70a2d03377d6797;p=openembedded.git

Merge ... '8feaf9690f0a2100128b1830f061fb71951fd3f4'
     and 'aa7e855436eea5f20330a56ce6657b0a9ebc844c'
---

d96ae6efdef0d81a0d122588f70a2d03377d6797