From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Feb 2007 15:33:45 +0000 (+0000)
Subject: merge of '152f9383d2f39ad2be81ef7b6cef6e3cd553f1fe'
X-Git-Tag: Release-2010-05/1~9261
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9805b6ac4b364e9bf75a4f39de23b6f0ee7685;p=openembedded.git

Merge ... '152f9383d2f39ad2be81ef7b6cef6e3cd553f1fe'
     and '695d9d0da30616c2995fd855c846ff8a66a86363'
---

4f9805b6ac4b364e9bf75a4f39de23b6f0ee7685