From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 28 Jun 2007 15:06:55 +0000 (+0000)
Subject: merge of 'cfd14c49a0d924daeec754ef84c5b25d0b1a730f'
X-Git-Tag: Release-2010-05/1~8868^2~268^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ce945dc948c98c2873b9fa5949b36acd7b3de81;p=openembedded.git

Merge ... 'cfd14c49a0d924daeec754ef84c5b25d0b1a730f'
     and 'e995761e9cc807169de17a910a63e2c893092e10'
---

4ce945dc948c98c2873b9fa5949b36acd7b3de81