From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 1 Apr 2007 23:24:53 +0000 (+0000)
Subject: merge of '2a4ed2b247005e6fa3609f9d3c300ed0c933215d'
X-Git-Tag: Release-2010-05/1~8868^2~843
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f6cb0d6fd2d1146f3f1f956d0d1eb2f4490db5;p=openembedded.git

Merge ... '2a4ed2b247005e6fa3609f9d3c300ed0c933215d'
     and 'd0db74174ddb4a1c1deffe220a9c89d078e8f640'
---

03f6cb0d6fd2d1146f3f1f956d0d1eb2f4490db5