From: Mike Westerhof <mwester@dls.net>
Date: Sat, 21 Oct 2006 22:02:57 +0000 (+0000)
Subject: merge of '82b5799fa84f05f84e4567892ec02e1793da418f'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=257d0988bb4bda7b46c529746b2dac2c6d898369;p=openembedded.git

Merge ... '82b5799fa84f05f84e4567892ec02e1793da418f'
     and 'cd6bceda2ad72ef7c9618be5c991fe044857be92'
---

257d0988bb4bda7b46c529746b2dac2c6d898369