From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Sun, 5 Oct 2008 00:57:38 +0000 (+0000)
Subject: merge of '0e6176690cfdc4e760baed9754ed33c972437f83'
X-Git-Tag: Release-2010-05/1~5850^2~22^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb2b188670508a81464f0e308178619bc0593501;p=openembedded.git

Merge ... '0e6176690cfdc4e760baed9754ed33c972437f83'
     and '34c94b40cf0e6a6fe0c504ae02571dbb2770c9ee'
---

eb2b188670508a81464f0e308178619bc0593501