From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 8 Jul 2010 11:45:02 +0000 (+0100)
Subject: Merge branch 'tk/master'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e69ce6e9b23a88fd267f4db2985ea3e5725ad01;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Merge branch 'tk/master'
---

5e69ce6e9b23a88fd267f4db2985ea3e5725ad01