From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Fri, 5 Oct 2007 12:43:03 +0000 (+0000)
Subject: merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb5a8ff3d88fca827e22ad48f136c7fe1c6cea10;p=openembedded.git

Merge ... 'aac60b186b977130a688c4d00bfde913fb6221eb'
     and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'
---

fb5a8ff3d88fca827e22ad48f136c7fe1c6cea10