From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 9 Mar 2007 23:08:08 +0000 (+0000)
Subject: merge of '6aeac16d88adfacea342067ea5b2bc44f9f19ddc'
X-Git-Tag: Release-2010-05/1~8868^2~1121^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67312f42893043c9c86cd06eb37832d8fc7c9bcd;p=openembedded.git

Merge ... '6aeac16d88adfacea342067ea5b2bc44f9f19ddc'
     and 'b2d9cd46c2dfa6e43c84754934f6b089af67c1d8'
---

67312f42893043c9c86cd06eb37832d8fc7c9bcd