From: Erik Hovland <erik@hovland.org>
Date: Wed, 30 Aug 2006 18:42:42 +0000 (+0000)
Subject: merge of 'd0e2c30b999cbef32c26717651606b8411ad02d6'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~122^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c;p=openembedded.git

Merge ... 'd0e2c30b999cbef32c26717651606b8411ad02d6'
     and 'ffac2606c1f6116f54c1871ff55c69f027252547'
---

4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c