Merge remote-tracking branch 'origin/release-0.11.1' into devel
authorZhang Qiang <qiang.z.zhang@intel.com>
Wed, 21 Nov 2012 05:24:23 +0000 (13:24 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Wed, 21 Nov 2012 05:24:23 +0000 (13:24 +0800)

Trivial merge