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

Merge ... 'a8bda210b9e6da106dbf0a8dbad274e5f6e1c2b6'
     and 'f54013c71b955c72ac2f9857142ce37d00ca9c8b'
---

92e46e1e24614310b6e82536dfcd38ca06ae22a3