From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 8 Jul 2010 11:45:02 +0000 (+0100)
Subject: Merge branch 'tk/master'
X-Git-Tag: 2011-1~5364
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4e3cb2adf518240d11d6c149dea075be086aeda1;p=openembedded-core.git

Merge branch 'tk/master'
---

4e3cb2adf518240d11d6c149dea075be086aeda1