Merge remote-tracking branch 'origin/release-0.2.1' into devel
authorZhang Qiang <qiang.z.zhang@intel.com>
Wed, 21 Nov 2012 05:26:54 +0000 (13:26 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Wed, 21 Nov 2012 05:26:54 +0000 (13:26 +0800)
commit8edfa847783712a0bd50ebc4a2bf162d7a029856
tree36e24e2dd58cd9813841d9842f5ea452b6dfc151
parent3a7dc41df2d9032da441be9f702f22804610b9f0
parent26002b7fdf07053a21a0ee407904275f2e2f23ee
Merge remote-tracking branch 'origin/release-0.2.1' into devel