From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 20 Aug 2007 18:31:14 +0000 (+0000)
Subject: merge of '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
X-Git-Tag: Release-2010-05/1~8866^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e9c45c2c4f8f33aec7cda649c3e0236075a0ced;p=openembedded.git

Merge ... '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
     and 'a76f71ae5f89679c6f4ec02e1b1b05e22a7c5905'
---

6e9c45c2c4f8f33aec7cda649c3e0236075a0ced