From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Apr 2008 13:28:41 +0000 (+0000)
Subject: merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
X-Git-Tag: Release-2010-05/1~7104^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b688dada8de8c2c9e8a42df102116b267f58b660;p=openembedded.git

Merge ... '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
     and 'efd9ac5db96b1872b9947299a1e10d54a34a86a3'
---

b688dada8de8c2c9e8a42df102116b267f58b660