From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 23 Aug 2007 12:10:56 +0000 (+0000)
Subject: merge of '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'
X-Git-Tag: Release-2010-05/1~8811^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e776408674d2fe1ed4ee93ec275a826c66a664b;p=openembedded.git

Merge ... '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'
     and 'ddf650a0cb7bb395770eac25e38c0ba82c1ec204'
---

3e776408674d2fe1ed4ee93ec275a826c66a664b