From: Mike Westerhof <mwester@dls.net>
Date: Wed, 15 Nov 2006 00:53:21 +0000 (+0000)
Subject: merge of '3bebc77134894dd40e010ff3b797313fedecf370'
X-Git-Tag: Release-2010-05/1~9453^2~491^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=684aef505e7cd2e509e9ea172fddea7ed68d50a5;p=openembedded.git

Merge ... '3bebc77134894dd40e010ff3b797313fedecf370'
     and '9568f6da6fd237c9b27f9262d8beb1fcd92bd41e'
---

684aef505e7cd2e509e9ea172fddea7ed68d50a5