From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 6 May 2007 23:44:06 +0000 (+0000)
Subject: merge of 'a42973bf7cd903eb0cda39c0e0c9ca3041188bf1'
X-Git-Tag: Release-2010-05/1~8868^2~517^2~2^2~1^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ac063a41073fbd98e8bdb703a0bcc1b8b13ff93;p=openembedded.git

Merge ... 'a42973bf7cd903eb0cda39c0e0c9ca3041188bf1'
     and 'dead8726201c5039d0257a605f354059105e7c99'
---

5ac063a41073fbd98e8bdb703a0bcc1b8b13ff93