From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Jan 2007 20:04:59 +0000 (+0000)
Subject: merge of '79b37f286afab909bc3f1f60b70ee2f4b2b54cbb'
X-Git-Tag: Release-2010-05/1~9453^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0523297263d5f7d65d97668250f11bb03f44895b;p=openembedded.git

Merge ... '79b37f286afab909bc3f1f60b70ee2f4b2b54cbb'
     and 'f3fc249ebe1706f1e7f3013e7d83dbdea6b9cabe'
---

0523297263d5f7d65d97668250f11bb03f44895b