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)
commit5bb385582136989abd04e0894db626b591f662f9
treee4bd599c9221e697155db99cccc806a6f14a4a25
parent63f1d6520e241cd05973f00fd6ee488c42e11e8d
parent34889e2ab0ee8447799fbf8b77b830391e30b72e
Merge branch 'jzhang/i686' of ssh://git.pokylinux.org/poky-contrib
meta/conf/local.conf.sample