From: Shane Volpe <shanevolpe@gmail.com>
Date: Mon, 24 Sep 2007 13:07:08 +0000 (+0000)
Subject: merge of '489882b57f4904cc20dd33cf8852288fb4785ead'
X-Git-Tag: Release-2010-05/1~8611
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd3c4c17264f76f2a257e30d703984206e97febc;p=openembedded.git

Merge ... '489882b57f4904cc20dd33cf8852288fb4785ead'
     and '9194b2f0a205c1d8e217aeb58797ab88ca972a45'
---

cd3c4c17264f76f2a257e30d703984206e97febc