From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Oct 2006 13:12:22 +0000 (+0000)
Subject: merge of '0168c99658bc90098d3e7ce80e7ada8c166dc75a'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~204
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4637e4d617aef7052092b216ae2791fcd593dbd;p=openembedded.git

Merge ... '0168c99658bc90098d3e7ce80e7ada8c166dc75a'
     and '9614071a6fe02cbe1635e02b64ed6d2535c9cbdc'
---

e4637e4d617aef7052092b216ae2791fcd593dbd