]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
Merge branch 'jzhang/i686' of ssh://git.pokylinux.org/poky-contrib
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Feb 2011 11:18:28 +0000 (11:18 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Feb 2011 11:18:28 +0000 (11:18 +0000)

Trivial merge