From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 6 Sep 2007 22:07:26 +0000 (+0000)
Subject: merge of '12c98ff43108305898021dff24c358c5f6cbbfb1'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79742f83912debcf86d2f4089a0520ad4aa3e1cf;p=openembedded.git

Merge ... '12c98ff43108305898021dff24c358c5f6cbbfb1'
     and '6671135b86ee827f25c322906b6251e88e4a5b32'
---

79742f83912debcf86d2f4089a0520ad4aa3e1cf