From: Mike Westerhof <mwester@dls.net>
Date: Tue, 4 Mar 2008 04:11:14 +0000 (+0000)
Subject: merge of '7712d9178e2d4268d697de3c404c8853aa202089'
X-Git-Tag: Release-2010-05/1~7588^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=320e2ef308a414d42c18aa339ddccd1f238b4b0b;p=openembedded.git

Merge ... '7712d9178e2d4268d697de3c404c8853aa202089'
     and 'b5b172da8f4d106e9070dd4957c42f3fea343e87'
---

320e2ef308a414d42c18aa339ddccd1f238b4b0b