]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
Merge branch 'tk/master'
authorJoshua Lock <josh@linux.intel.com>
Thu, 8 Jul 2010 11:45:02 +0000 (12:45 +0100)
committerJoshua Lock <josh@linux.intel.com>
Thu, 8 Jul 2010 11:45:02 +0000 (12:45 +0100)

Trivial merge