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)

Trivial merge