From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 11 Mar 2007 13:53:48 +0000 (+0000)
Subject: merge of '7c2eec63193c90446b069e73cca7fa162538fb4a'
X-Git-Tag: Release-2010-05/1~8868^2~1110^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cac3fe8fae9cba224e2b7ba5d402e806fe1e525c;p=openembedded.git

Merge ... '7c2eec63193c90446b069e73cca7fa162538fb4a'
     and 'f64f76da145d0ecd8967b8f45a684d465d56b6c2'
---

cac3fe8fae9cba224e2b7ba5d402e806fe1e525c