Merge remote branch 'origin/master'
authorJF Ding <jian-feng.ding@intel.com>
Mon, 28 Nov 2011 06:35:27 +0000 (14:35 +0800)
committerJF Ding <jian-feng.ding@intel.com>
Mon, 28 Nov 2011 06:35:27 +0000 (14:35 +0800)

Trivial merge