From: Erik Hovland <erik@hovland.org>
Date: Thu, 31 Aug 2006 17:33:31 +0000 (+0000)
Subject: merge of 'c131d7e3d40b16059d9414cab4af635e5681c790'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~122^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960492673b26961cc6d11be4c4e8994a9bbdf593;p=openembedded.git

Merge ... 'c131d7e3d40b16059d9414cab4af635e5681c790'
     and 'e16e6a228ba05836f11e6096da8531c66005dd42'
---

960492673b26961cc6d11be4c4e8994a9bbdf593