From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 25 Mar 2007 05:35:59 +0000 (+0000)
Subject: merge of '6a73c5c1eb38e3cc78e63a37f3471f4cc581b27b'
X-Git-Tag: Release-2010-05/1~8868^2~982
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a28f8e6f88b974630f36d59c7f273e12f6a3be;p=openembedded.git

Merge ... '6a73c5c1eb38e3cc78e63a37f3471f4cc581b27b'
     and 'ea9eb1ab8940b614ef5bbd25f1275174941d1e40'
---

93a28f8e6f88b974630f36d59c7f273e12f6a3be